fix release_type

viam-modules · Jul 12, 2023 · e1ca2e0 · e1ca2e0
1 parent 497aafe
commit e1ca2e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -35,13 +35,13 @@ jobs:
 
     steps:
     - name: Check out code
-      if: github.event_name == 'workflow_dispatch' || github.event_name == 'push'
+      if: inputs.release_type != 'pr'
       uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Check out PR branch code
-      if: github.event_name == 'pull_request_target'
+      if: inputs.release_type == 'pr'
       uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
@@ -66,7 +66,7 @@ jobs:
         credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
 
     - name: Build and Package (PR)
-      if: contains(github.event.pull_request.labels.*.name, 'appimage') || contains(github.event.pull_request.labels.*.name, 'appimage-ignore-tests')
+      if: inputs.release_type == 'pr'
       run: |
         sudo -u testbot bash -lc 'make BUILD_CHANNEL="pr-${{ github.event.pull_request.number }}" appimage'
 

diff --git a/.github/workflows/pullrequest-trusted.yml b/.github/workflows/pullrequest-trusted.yml
@@ -29,6 +29,8 @@ jobs:
       !contains(github.event.pull_request.labels.*.name, 'appimage-ignore-tests') &&
       contains(github.event.pull_request.labels.*.name, 'appimage') && needs.test.result == 'success'
     uses: viamrobotics/viam-cartographer/.github/workflows/appimage.yml@RSDK-3591_UpdateWorkflows
+    with:
+      release_type: 'pr'
     secrets:
       GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
 
@@ -37,5 +39,7 @@ jobs:
        always() && !cancelled() && contains(github.event.pull_request.labels.*.name, 'safe to test') &&
        contains(github.event.pull_request.labels.*.name, 'appimage-ignore-tests')
     uses: viamrobotics/viam-cartographer/.github/workflows/appimage.yml@RSDK-3591_UpdateWorkflows
+    with:
+      release_type: 'pr'
     secrets:
       GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}