Cover both PR and Commit build CI

Signed-off-by: Derek Nola <[email protected]>
rancher · Aug 29, 2024 · 9967856 · 9967856
1 parent df802c8
commit 9967856
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,14 +30,12 @@ jobs:
           secret/data/github/repo/${{ github.repository }}/aws/rke2-ci-uploader/credentials AWS_ACCESS_KEY_ID ;
           secret/data/github/repo/${{ github.repository }}/aws/rke2-ci-uploader/credentials AWS_SECRET_ACCESS_KEY ;
     - name: Build
-      run: |
-        dapper -f Dockerfile --target dapper make dapper-ci
+      run: dapper -f Dockerfile --target dapper make dapper-ci
       env:
         AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
     - name: Test
-      run: |
-        dapper -f Dockerfile --target dapper make test
+      run: dapper -f Dockerfile --target dapper make test
     - name: Upload Logs on Failure
       if: ${{ failure() }}
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -20,11 +20,15 @@ jobs:
         curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper
         chmod +x /usr/local/bin/dapper
     - name: Build
-      run: |
-        dapper -f Dockerfile --target dapper make dapper-ci
+      run: dapper -f Dockerfile --target dapper make dapper-ci
     - name: Test
-      run: |
-        dapper -f Dockerfile --target dapper make test
+      run: dapper -f Dockerfile --target dapper make test
+    - name: Upload Logs on Failure
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: rke2-test-logs
+        path: /tmp/rke2-logs/
   build-arm64:
     runs-on: runs-on,runner=8cpu-linux-arm64,run-id=${{ github.run_id }},image=ubuntu22-full-arm64,hdd=64
     steps: