Merge pull request #184 from lrytz/commit-status

AppVeyor status

Author: lrytz

.travis.yml

@@ -41,19 +41,17 @@ env:
 
 script:
   - source scripts/common
-  - if [[ "$scala_sha" != "" ]]; then postCommitStatus "pending"; fi
+  - postCommitStatus "pending"
   - admin/build.sh
 
 after_script:
   - |
-    if [[ "$scala_sha" != "" ]]; then
-      if [[ "$TRAVIS_TEST_RESULT" == "0" ]]; then
-        local state="success"
-      else
-        local state="failure"
-      fi
-      postCommitStatus $state
+    if [[ "$TRAVIS_TEST_RESULT" == "0" ]]; then
+      local state="success"
+    else
+      local state="failure"
     fi
+    postCommitStatus $state
 
 cache:
   directories:

admin/build.sh

@@ -36,8 +36,8 @@ function setupSSH() {
 }
 
 function triggerMsiRelease() {
-  local jsonTemplate='{ "accountName": "scala", "projectSlug": "scala-dist", "branch": "%s", "commitId": "%s", "environmentVariables": { "mode": "%s", "version": "%s" } }'
-  local json=$(printf "$jsonTemplate" "$TRAVIS_BRANCH" "$TRAVIS_COMMIT" "$mode" "$version")
+  local jsonTemplate='{ "accountName": "scala", "projectSlug": "scala-dist", "branch": "%s", "commitId": "%s", "environmentVariables": { "mode": "%s", "version": "%s", "scala_sha": "%s" } }'
+  local json=$(printf "$jsonTemplate" "$TRAVIS_BRANCH" "$TRAVIS_COMMIT" "$mode" "$version" "$scala_sha")
 
   local curlStatus=$(curl \
     -s -o /dev/null -w "%{http_code}" \

appveyor.yml

@@ -14,13 +14,24 @@ environment:
     secure: X1Ix1soRBDMtfbi8IFNPOggDP2XquhW+uKcJ+XC0kiM=
   AWS_SECRET_ACCESS_KEY:
     secure: woXwpM2+P3uZ1+LFM+SbJEKLfi7Kax5PvqJSN62nn1PQrJgEzVUAIoRGoXBx6X72
+  GITHUB_OAUTH_TOKEN:
+    secure: oji2LTrdEhQhJQOoRU3TFuCmCb92XD1BJKW7uw0/XJdEFkOrb4lKbHjPGeuOY6/5
 
 install:
   - cmd: choco install sbt -ia "INSTALLDIR=""C:\sbt"""
   - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
 
 build_script:
-  - ps: .\admin\build.ps1
+  - ps: >-
+      . .\scripts\common.ps1
+      postCommitStatus "pending"
+      .\admin\build.ps1
+
+on_success:
+  - ps: postCommitStatus "pending"
+
+on_failure:
+  - ps: postCommitStatus "failure"
 
 cache:
   - C:\sbt\

scripts/common

@@ -12,18 +12,20 @@ function travis_fold_end() {
 # Params:
 #   - state: pending / success / failed / error
 function postCommitStatus() {
-  local jsonTemplate='{ "state": "%s", "target_url": "%s", "description": "%s", "context": "%s"}'
-  local json=$(printf "$jsonTemplate" "$1" "https://travis-ci.org/scala/scala-dist/builds/$TRAVIS_BUILD_ID" "$1" "travis/scala-dist/$version/$mode")
+  if [[ "$scala_sha" != "" ]]; then
+    local jsonTemplate='{ "state": "%s", "target_url": "%s", "description": "%s", "context": "%s"}'
+    local json=$(printf "$jsonTemplate" "$1" "https://travis-ci.org/scala/scala-dist/builds/$TRAVIS_BUILD_ID" "$1" "travis/scala-dist/$version/$mode")
 
-  local curlStatus=$(curl \
-    -s -o /dev/null -w "%{http_code}" \
-    -H "Accept: application/vnd.github.v3+json" \
-    -H "Authorization: token $GITHUB_OAUTH_TOKEN" \
-    -d "$json" \
-    https://api.github.com/repos/scala/scala/statuses/$scala_sha)
+    local curlStatus=$(curl \
+      -s -o /dev/null -w "%{http_code}" \
+      -H "Accept: application/vnd.github.v3+json" \
+      -H "Authorization: token $GITHUB_OAUTH_TOKEN" \
+      -d "$json" \
+      https://api.github.com/repos/scala/scala/statuses/$scala_sha)
 
-  [[ "$curlStatus" == "201" ]] || {
-    echo "Failed to publish GitHub commit status"
-    exit 1
-  }
+    [[ "$curlStatus" == "201" ]] || {
+      echo "Failed to publish GitHub commit status"
+      exit 1
+    }
+  fi
 }

scripts/common.ps1

@@ -0,0 +1,21 @@
+Function postCommitStatus($state) {
+  if ($env:scala_sha -ne '') {
+    $jsonTemplate = '{{ "state": "{0}", "target_url": "{1}", "description": "{2}", "context": "{3}" }}'
+    $json = "$jsonTemplate" -f "$state", "https://ci.appveyor.com/project/scala/scala-dist/build/$env:APPVEYOR_BUILD_ID", "$state", "appveyor/scala-dist/$env:version/$env:mode"
+
+    # https://stackoverflow.com/questions/41618766/powershell-invoke-webrequest-fails-with-ssl-tls-secure-channel
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    $respone = Invoke-WebRequest `
+      "https://api.github.com/repos/scala/scala/statuses/$env:scala_sha" `
+      -Method 'POST' `
+      -Body "$json" `
+      -Headers @{"Accept"="application/vnd.github.v3+json"; "Authorization"="token $env:GITHUB_OAUTH_TOKEN"} `
+      -UseBasicParsing
+
+    if ($respone.StatusCode -ne 201) {
+      echo "Failed to publish GitHub commit status"
+      Exit 1
+    }
+  }
+}