Merge pull request #251 from openziti/release-next

Publish to artifactory after tagging, otherwise versions aren't correct
openziti · Dec 3, 2020 · 57466fb · 57466fb
2 parents 28ccae0 + 31761c9
commit 57466fb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - release-*
+      - release-v*
   pull_request:
 
 env:
@@ -88,7 +88,6 @@ jobs:
 
       - name: Build and Test
         env:
-          JFROG_API_KEY: ${{ secrets.JFROG_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
@@ -101,10 +100,9 @@ jobs:
           CC=arm-linux-gnueabihf-gcc CGO_ENABLED=true gox -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./...
           aws s3 sync --no-progress s3://ziti-cmd-build-tmp/${{ github.run_id }} release/
           aws s3 rm --recursive s3://ziti-cmd-build-tmp/${{ github.run_id }}
-          $(go env GOPATH)/bin/ziti-ci publish-to-artifactory
 
       - name: Publish
-        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/head/release-')
+        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/head/release-v')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -113,9 +111,11 @@ jobs:
 
       - name: Trigger Smoketest
         env:
+          JFROG_API_KEY: ${{ secrets.JFROG_API_KEY }}
           jenkins_user: ${{ secrets.JENKINS_USER }}
           jenkins_user_token: ${{ secrets.JENKINS_USER_TOKEN }}
           jenkins_job_token: ${{ secrets.JENKINS_JOB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          $(go env GOPATH)/bin/ziti-ci publish-to-artifactory
           $(go env GOPATH)/bin/ziti-ci trigger-jenkins-smoke-build