Merge remote-tracking branch 'origin/master' into ui

darwinia-network · Sep 17, 2020 · ff739ec · ff739ec
2 parents c8ce3bc + 8fb1df0
commit ff739ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -16,18 +16,16 @@ jobs:
           persist-credentials: false
           ssh-key: "${{ secrets.ITERING_ACTIONS_DEPLOY_KEY }}"
 
-      - uses: docker/build-push-action@v1
+      - name: Docker login
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.QUAY_IO_BOT_USERNAME }}
           password: ${{ secrets.QUAY_IO_BOT_PASSWORD }}
           registry: quay.io
-          repository: ${{ github.repository }}
-          add_git_labels: true
-          tag_with_sha: true
-          tag_with_ref: true
 
-      - uses: ./.github/actions/trigger-deployment
+      - uses: ./.github/actions/docker-build-deploy
         with:
           deploy_phase: production
+          docker_registry: quay.io
           trigger_token: ${{ secrets.ITERING_DEPLOYMENT_TRIGGER_TOKEN }}
           trigger_endpoint: ${{ secrets.ITERING_DEPLOYMENT_TRIGGER_ENDPOINT }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -18,18 +18,16 @@ jobs:
           persist-credentials: false
           ssh-key: "${{ secrets.ITERING_ACTIONS_DEPLOY_KEY }}"
 
-      - uses: docker/build-push-action@v1
+      - name: Docker login
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.QUAY_IO_BOT_USERNAME }}
           password: ${{ secrets.QUAY_IO_BOT_PASSWORD }}
           registry: quay.io
-          repository: ${{ github.repository }}
-          add_git_labels: true
-          tag_with_sha: true
-          tag_with_ref: false # Do not tag on every individual branch
 
-      - uses: ./.github/actions/trigger-deployment
+      - uses: ./.github/actions/docker-build-deploy
         with:
           deploy_phase: staging
+          docker_registry: quay.io
           trigger_token: ${{ secrets.ITERING_DEPLOYMENT_TRIGGER_TOKEN }}
           trigger_endpoint: ${{ secrets.ITERING_DEPLOYMENT_TRIGGER_ENDPOINT }}