Skip to content

Commit

Permalink
Revert "FI from master to network-february-release (#5391)" (#5393)
Browse files Browse the repository at this point in the history
This reverts commit 8f28f7f.
  • Loading branch information
sergey-shandar authored Mar 15, 2019
1 parent 8f28f7f commit 64d97f2
Show file tree
Hide file tree
Showing 409 changed files with 8,084 additions and 42,856 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ Icon
# Thumbnails
._*

# Ignore repo files
/scripts/stostools/restoredPackages
/scripts/stostools/restoredpackages

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
Expand Down
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ env:
matrix:
- MODE=branchStrategy
- MODE=syntax CHECK_NAME="Syntax Validator"
- MODE=python CHECK_NAME="SDK Generation - Python"
- MODE=node CHECK_NAME="SDK Generation - Node"
- MODE=typescript CHECK_NAME="SDK Generation - TypeScript"
- MODE=ruby CHECK_NAME="SDK Generation - Ruby"
- MODE=java CHECK_NAME="SDK Generation - Java"
- MODE=go CHECK_NAME="SDK Generation - Go"
- MODE=semantic PR_ONLY=true CHECK_NAME="Semantic Validator"
- MODE=semantic PR_ONLY=false
- MODE=model PR_ONLY=true CHECK_NAME="Model Validator"
Expand All @@ -16,12 +22,41 @@ env:
matrix:
fast_finish: true
allow_failures:
- env: MODE=node CHECK_NAME="SDK Generation - Node"
- env: MODE=typescript CHECK_NAME="SDK Generation - TypeScript"
- env: MODE=ruby CHECK_NAME="SDK Generation - Ruby"
- env: MODE=java CHECK_NAME="SDK Generation - Java"
- env: MODE=go CHECK_NAME="SDK Generation - Go"
- env: MODE=semantic PR_ONLY=false
- env: MODE=model PR_ONLY=false
- env: MODE=model PR_ONLY=true CHECK_NAME="Model Validator"
- env: MODE=BreakingChange PR_ONLY=true CHECK_NAME="Breaking Changes"
install: true
script:
- >-
if [[ $MODE == 'python' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-python -v
fi
- >-
if [[ $MODE == 'node' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-node -v
fi
- >-
if [[ $MODE == 'typescript' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-js -v
fi
- >-
if [[ $MODE == 'ruby' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-ruby -v
fi
- >-
if [[ $MODE == 'go' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-go -o latest -v
fi
- >-
if [[ $MODE == 'java' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-java -v
fi
- >-
if [[ $MODE == 'branchStrategy' ]]; then
# Check to ensure CI is not executing for a PR against the master branch in the private repository
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
displayName: 'Model Validation'

- job: "BreakingChange"
condition: "not(variables['PRIVATE'])"
pool:
vmImage: 'Ubuntu 16.04'
steps:
Expand All @@ -70,7 +69,6 @@ jobs:
displayName: 'Breaking Changes'

- job: "LintDiff"
condition: "not(variables['PRIVATE'])"
variables:
NODE_OPTIONS: '--max-old-space-size=8192'
pool:
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
"@microsoft.azure/async-io": "^1.0.21",
"@microsoft.azure/literate": "^1.0.21",
"@microsoft.azure/polyfill": "^1.0.17",
"@ts-common/commonmark-to-markdown": "^1.1.10",
"@ts-common/commonmark-to-markdown": "^1.1.9",
"@ts-common/fs": "0.1.0",
"@types/js-yaml": "^3.12.0",
"fs-extra": "^3.0.1",
"glob": "^5.0.14",
"js-yaml": "^3.12.2",
"js-yaml": "^3.8.2",
"json-schema-ref-parser": "^3.1.2",
"mocha": "*",
"@azure/oad": "0.2.0",
"oav": "^0.14.5",
"oad": "0.1.12",
"oav": "^0.13.4",
"request": "^2.61.0",
"request-promise-native": "^1.0.5",
"typescript": "^3.2.4",
"z-schema": "^3.25.1",
"ts-node": "^8.0.3"
"z-schema": "^3.25.0",
"ts-node": "^8.0.1"
},
"dependencies": {
"@octokit/rest": "^15.2.6"
Expand Down
2 changes: 1 addition & 1 deletion scripts/breaking-change.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const utils = require('../test/util/utils'),
fs = require('fs-extra'),
os = require('os'),
exec = require('util').promisify(require('child_process').exec),
oad = require('@azure/oad');
oad = require('oad');

// This map is used to store the mapping between files resolved and stored location
var resolvedMapForNewSpecs = {};
Expand Down
6 changes: 5 additions & 1 deletion scripts/momentOfTruth.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ async function getLinterResult(swaggerPath) {
throw new Error("AutoRest failed");
}

let resultString = stdout + stderr;
if (stderr !== "") {
console.error(`Error: ${stderr}`)
process.exit(1)
}
let resultString = stdout;
if (resultString.indexOf('{') !== -1) {
resultString = resultString.replace(/Processing batch task - {.*} \.\n/g, "");
resultString = "[" + resultString.substring(resultString.indexOf('{')).trim().replace(/\}\n\{/g, "},\n{") + "]";
Expand Down
132 changes: 0 additions & 132 deletions scripts/stostools/Directory.Build.props

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/stostools/LaunchSToS.bat

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/stostools/nuget.config

This file was deleted.

43 changes: 0 additions & 43 deletions scripts/stostools/stos.proj

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Please also specify `--azure-libraries-for-java=<path to the root directory of y

``` yaml $(tag) == 'package-2018-12-03' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.EnterpriseKnowledgeGraphService.v2018-12-03
output-folder: $(azure-libraries-for-java-folder)/EnterpriseKnowledgeGraphService/resource-manager/v2018-12-03
namespace: com.microsoft.azure.management.EnterpriseKnowledgeGraphservice.v2018-12-03
output-folder: $(azure-libraries-for-java-folder)/EnterpriseKnowledgeGraphservice/resource-manager/v2018-12-03
regenerate-manager: true
generate-interface: true
```
Expand Down Expand Up @@ -88,4 +88,4 @@ csharp:
namespace: Microsoft.Azure.Management.EnterpriseKnowledgeGraphService
output-folder: $(csharp-sdks-folder)/EnterpriseKnowledgeGraphService/Microsoft.Azure.Management.EnterpriseKnowledgeGraphService/Generated
clear-output-folder: true
```
```
Loading

0 comments on commit 64d97f2

Please sign in to comment.