From ee4ed6e91af63d6586bcc828dd8dfe84c8e33025 Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Thu, 21 Feb 2019 16:41:19 -0800 Subject: [PATCH 1/8] empty parameters --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7c2c74e4bab..33b906fdb9de 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -71,14 +71,19 @@ jobs: matrix: ruby: AZURE_SDK_REPO: azure-sdk-for-ruby + AZURE_SDK_PARAMS: '' java: AZURE_SDK_REPO: azure-sdk-for-java + AZURE_SDK_PARAMS: '' javascript: AZURE_SDK_REPO: azure-sdk-for-js + AZURE_SDK_PARAMS: '' node: AZURE_SDK_REPO: azure-sdk-for-node + AZURE_SDK_PARAMS: '' python: AZURE_SDK_REPO: azure-sdk-for-python + AZURE_SDK_PARAMS: '' go: AZURE_SDK_REPO: azure-sdk-for-go AZURE_SDK_PARAMS: '-o latest' From 1f47b36459dac95027d6bad0288aebd4b5c5def2 Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Thu, 21 Feb 2019 17:24:40 -0800 Subject: [PATCH 2/8] TRAVIS_BRANCH --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33b906fdb9de..7d5262e138ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,6 +4,7 @@ trigger: none variables: TRAVIS: 'true' + TRAVIS_BRANCH: $(Build.SourceBranchName) TRAVIS_PULL_REQUEST: $(System.PullRequest.PullRequestId) TRAVIS_REPO_SLUG: $(Build.Repository.Name) TRAVIS_PULL_REQUEST_SLUG: $(Build.Repository.Name) From 9889ad6f102f4e61a9994c3da8e14d98884f4856 Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Thu, 21 Feb 2019 17:36:11 -0800 Subject: [PATCH 3/8] target branch --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7d5262e138ed..d4399cde5450 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,7 @@ trigger: none variables: TRAVIS: 'true' - TRAVIS_BRANCH: $(Build.SourceBranchName) + TRAVIS_BRANCH: $(System.PullRequest.TargetBranch) TRAVIS_PULL_REQUEST: $(System.PullRequest.PullRequestId) TRAVIS_REPO_SLUG: $(Build.Repository.Name) TRAVIS_PULL_REQUEST_SLUG: $(Build.Repository.Name) From 712e7aaf9b44941f9ad68c841238c9f341489a38 Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Fri, 22 Feb 2019 09:54:00 -0800 Subject: [PATCH 4/8] trying to set env var --- azure-pipelines.yml | 2 ++ package.json | 3 ++- scripts/travis-env.ts | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 scripts/travis-env.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d4399cde5450..9aca1e784f89 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,6 +21,8 @@ jobs: displayName: 'npm install' inputs: verbose: false + - script: 'npm run travis-env' + - script: 'echo $TRAVIS_BRANCH' - script: 'npm test -- test/syntax.js' - job: "Semantic" diff --git a/package.json b/package.json index fbc3783ec923..f95d28ec256a 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "test": "mocha -t 500000 --reporter min", "oav": "oav", "tsc": "tsc", - "multiapi": "ts-node ./scripts/multiapi.ts" + "multiapi": "ts-node ./scripts/multiapi.ts", + "travis-env": "ts-node ./scripts/travis-env.ts" } } diff --git a/scripts/travis-env.ts b/scripts/travis-env.ts new file mode 100644 index 000000000000..171c2e012f36 --- /dev/null +++ b/scripts/travis-env.ts @@ -0,0 +1,8 @@ +import * as child_process from "child_process" + +const systemPullRequestTargetBranch = process.env["System.PullRequest.TargetBranch"] +if (systemPullRequestTargetBranch !== undefined) { + const s = systemPullRequestTargetBranch.split("/") + const travisBranch = s[s.length - 1] + child_process.spawnSync(`export TRAVIS_BRANCH=${travisBranch}`) +} \ No newline at end of file From 3db2d81b72a9db89731a04866fd1ec0a06bab05f Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Fri, 22 Feb 2019 10:08:03 -0800 Subject: [PATCH 5/8] use shell --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9aca1e784f89..bcd19cd228a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,8 +21,7 @@ jobs: displayName: 'npm install' inputs: verbose: false - - script: 'npm run travis-env' - - script: 'echo $TRAVIS_BRANCH' + - script: "echo $(System.PullRequest.TargetBranch) | cut -d '/' -f 3" - script: 'npm test -- test/syntax.js' - job: "Semantic" From 8cfd57b4d228e6e5306b57a0e7c462e95e6e150a Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Fri, 22 Feb 2019 10:19:43 -0800 Subject: [PATCH 6/8] info --- azure-pipelines.yml | 7 ++++++- package.json | 3 +-- scripts/travis-env.ts | 8 -------- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 scripts/travis-env.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bcd19cd228a7..6e95d579ad5d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,11 +17,16 @@ jobs: pool: vmImage: 'Ubuntu 16.04' steps: + - script: | + echo TRAVIS: $(TRAVIS) + echo TRAVIS_BRANCH: $(TRAVIS_BRANCH) + echo TRAVIS_PULL_REQUEST: $(TRAVIS_PULL_REQUEST) + echo TRAVIS_PULL_REQUEST_SLUG: $(TRAVIS_PULL_REQUEST_SLUG) + echo TRAVIS_PULL_REQUEST_SHA: $(TRAVIS_PULL_REQUEST_SHA) - task: Npm@1 displayName: 'npm install' inputs: verbose: false - - script: "echo $(System.PullRequest.TargetBranch) | cut -d '/' -f 3" - script: 'npm test -- test/syntax.js' - job: "Semantic" diff --git a/package.json b/package.json index f95d28ec256a..fbc3783ec923 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "test": "mocha -t 500000 --reporter min", "oav": "oav", "tsc": "tsc", - "multiapi": "ts-node ./scripts/multiapi.ts", - "travis-env": "ts-node ./scripts/travis-env.ts" + "multiapi": "ts-node ./scripts/multiapi.ts" } } diff --git a/scripts/travis-env.ts b/scripts/travis-env.ts deleted file mode 100644 index 171c2e012f36..000000000000 --- a/scripts/travis-env.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as child_process from "child_process" - -const systemPullRequestTargetBranch = process.env["System.PullRequest.TargetBranch"] -if (systemPullRequestTargetBranch !== undefined) { - const s = systemPullRequestTargetBranch.split("/") - const travisBranch = s[s.length - 1] - child_process.spawnSync(`export TRAVIS_BRANCH=${travisBranch}`) -} \ No newline at end of file From 9054ea5c2a8b368f62ea5eded900b0ee91351f1d Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Fri, 22 Feb 2019 10:55:10 -0800 Subject: [PATCH 7/8] more info --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e95d579ad5d..7a5c27aee8e5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,9 +20,11 @@ jobs: - script: | echo TRAVIS: $(TRAVIS) echo TRAVIS_BRANCH: $(TRAVIS_BRANCH) + echo TRAVIS_REPO_SLUG: $(TRAVIS_REPO_SLUG) echo TRAVIS_PULL_REQUEST: $(TRAVIS_PULL_REQUEST) echo TRAVIS_PULL_REQUEST_SLUG: $(TRAVIS_PULL_REQUEST_SLUG) echo TRAVIS_PULL_REQUEST_SHA: $(TRAVIS_PULL_REQUEST_SHA) + echo PR_ONLY: $(PR_ONLY) - task: Npm@1 displayName: 'npm install' inputs: From 0452fc69bbca3b9ab0873d4cb03328ce0faece0c Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Fri, 22 Feb 2019 11:14:03 -0800 Subject: [PATCH 8/8] Pull Request Number --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7a5c27aee8e5..ec2bce0302ae 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,7 @@ trigger: none variables: TRAVIS: 'true' TRAVIS_BRANCH: $(System.PullRequest.TargetBranch) - TRAVIS_PULL_REQUEST: $(System.PullRequest.PullRequestId) + TRAVIS_PULL_REQUEST: $(System.PullRequest.PullRequestNumber) TRAVIS_REPO_SLUG: $(Build.Repository.Name) TRAVIS_PULL_REQUEST_SLUG: $(Build.Repository.Name) TRAVIS_PULL_REQUEST_SHA: $(Build.SourceVersion)