gh actions: replace specific versions with main, switch to setup-java@v2

floooh · Aug 21, 2024 · 3a7cbad · 3a7cbad
1 parent 4905a53
commit 3a7cbad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
     windows:
         runs-on: windows-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: win64-vstudio-debug
           run:  python3 fips build win64-vstudio-debug
         - name: win64-vstudio-release
@@ -26,7 +26,7 @@ jobs:
     mac:
         runs-on: macos-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: osx-make-debug
           run:  python3 fips build osx-make-debug
         - name: osx-make-release
@@ -42,7 +42,7 @@ jobs:
     ios:
         runs-on: macos-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: ios-xcode-debug
           run:  python3 fips build ios-xcode-debug -- CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
         - name: ios-xcode-release
@@ -58,7 +58,7 @@ jobs:
     linux:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: prepare
           run:  |
             sudo apt-get update
@@ -83,7 +83,7 @@ jobs:
     webgl2:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: prepare
           run: |
             sudo apt-get install ninja-build
@@ -99,7 +99,7 @@ jobs:
     wgpu:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@main
         - name: prepare
           run: |
             sudo apt-get install ninja-build
@@ -115,9 +115,10 @@ jobs:
     android:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v4
-        - uses: actions/setup-java@v1
+        - uses: actions/checkout@main
+        - uses: actions/setup-java@v2
           with:
+            distribution: 'zulu'
             java-version: '8'
         - name: prepare
           run: |

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ jobs:
   build_webgl:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@main
       - uses: seanmiddleditch/gha-setup-ninja@master
       - name: prepare
         run:  |
@@ -18,7 +18,7 @@ jobs:
           python3 fips set local on
           python3 fips webpage build webgl
       - name: upload-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@main
         with:
           name: webpage_webgl
           path: fips-files/deploy/sokol-webpage-webgl
@@ -27,7 +27,7 @@ jobs:
   build_webgpu:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@main
       - uses: seanmiddleditch/gha-setup-ninja@master
       - name: prepare
         run:  |
@@ -39,7 +39,7 @@ jobs:
           python3 fips set local on
           python3 fips webpage build webgpu
       - name: upload-artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@main
         with:
           name: webpage_webgpu
           path: fips-files/deploy/sokol-webpage-webgpu
@@ -49,11 +49,11 @@ jobs:
     needs: build_webgl
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@main
         with:
           repository: floooh/sokol-html5
           ssh-key: ${{ secrets.SOKOL_HTML5_DEPLOY }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@main
         with:
           name: webpage_webgl
       - name: "commit and push"
@@ -68,11 +68,11 @@ jobs:
     needs: build_webgpu
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@main
         with:
           repository: floooh/sokol-webgpu
           ssh-key: ${{ secrets.SOKOL_WEBGPU_DEPLOY }}
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@main
         with:
           name: webpage_webgpu
       - name: "commit and push"