Merge branch 'main' into dependabot/github_actions/actions/checkout-4

erikeelde · Jan 11, 2024 · 84a8b4e · 84a8b4e
2 parents 1c264cf + 91ef196
commit 84a8b4e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
@@ -28,16 +28,17 @@ jobs:
           echo "${{ secrets.SERVICE_ACCOUNT }}" > service_account.json.asc
           gpg -d --passphrase "${{ secrets.GPG_ENCRYPTION_KEY }}" --batch service_account.json.asc > service_account.json
 
-      - name: "Calculate build number"
-        id: version_information
-        uses: ./.github/actions/version_information
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
 
+      - name: "Calculate build number"
+        id: version_information
+        uses: ./.github/actions/version_information
+
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 

diff --git a/.github/workflows/core-release.yml b/.github/workflows/core-release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/flow-noop-release.yml b/.github/workflows/flow-noop-release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/flow-release.yml b/.github/workflows/flow-release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
@@ -37,7 +37,7 @@ jobs:
         run: ./gradlew :toggles-app:packageDebug :toggles-sample:packageDebug
 
       - name: Upload apks
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Apks
           path: '**/build/outputs/apk/*'

diff --git a/.github/workflows/prefs-noop-release.yml b/.github/workflows/prefs-noop-release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/prefs-release.yml b/.github/workflows/prefs-release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: '0'
 
       - name: Check out java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
@@ -49,7 +49,7 @@ jobs:
         run: ./gradlew :toggles-prefs-noop:check
 
       - name: Upload reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Reports