Update TWiStErRob/github-workflows action from v1 to v2 (major v2) (#130

) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Róbert Papp (TWiStErRob) <[email protected]>
TWiStErRob · Mar 15, 2024 · 354fadc · 354fadc
1 parent dfe49f6
commit 354fadc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/CI-build.yml → .github/workflows/ci-build.yml b/.github/workflows/CI-build.yml → .github/workflows/ci-build.yml
@@ -5,7 +5,7 @@ on:
 jobs:
 
   build:
-    runs-on: ubuntu-latest
+    name: "build"
     timeout-minutes: 30
 
     permissions:
@@ -14,6 +14,11 @@ jobs:
       # EnricoMi/publish-unit-test-result-action -> https://github.com/EnricoMi/publish-unit-test-result-action#permissions
       checks: write
 
+    runs-on: ubuntu-latest
+    defaults: 
+      run:
+        shell: bash
+
     steps:
 
       - name: "Set up JDK 17."
@@ -53,33 +58,34 @@ jobs:
           :web:status-history:appengineStage
 
       - name: "Upload 'Unit Test Results' artifact."
-        if: success() || failure()
+        if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v4
         with:
           name: 'Unit Test Results'
           if-no-files-found: error
           path: ${{ github.workspace }}/**/build/reports/tests/*/
 
       - name: "Upload 'Android Lint Results' artifact."
-        if: success() || failure()
+        if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v4
         with:
           name: 'Android Lint Results'
           if-no-files-found: error
           path: ${{ github.workspace }}/**/build/reports/lint-results*
 
       - name: "Publish 'Unit Results' check suite."
-        if: success() || failure()
+        if: ${{ success() || failure() }}
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: '🔔 Test: Unit Results'
           comment_mode: off
           report_individual_runs: true
+          action_fail_on_inconclusive: true
           test_changes_limit: 0
           junit_files: ${{ github.workspace }}/**/build/test-results/*/TEST-*.xml
 
       - name: "Upload 'APKs' artifact."
-        if: success() || failure()
+        if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v4
         with:
           name: 'APKs'

diff --git a/.github/workflows/CI.yml → .github/workflows/ci.yml b/.github/workflows/CI.yml → .github/workflows/ci.yml
@@ -2,8 +2,6 @@ name: "CI"
 
 on:
   push:
-    branches:
-      - '**'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('ci-main-{0}', github.sha) || format('ci-{0}', github.ref) }}
@@ -13,9 +11,17 @@ jobs:
 
   validate:
     name: "🦺 Validation"
-    uses: TWiStErRob/github-workflows/.github/workflows/validate.yml@19333c04e57739ec6074b09c6ca09c225c94dc09 # v1
+    uses: TWiStErRob/github-workflows/.github/workflows/validate.yml@94f2ec4f96e146200f801fe7e09310c79cb2d2b3 # v2
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+
 
   build:
     name: "🔨 Build & Verify"
     needs: validate
-    uses: ./.github/workflows/CI-build.yml
+    uses: ./.github/workflows/ci-build.yml
+    permissions:
+      contents: read
+      checks: write