Update GitHub Actions

.github/workflows/android.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Get modern CMake and Ninja
-        uses: "lukka/[email protected].1"
+        uses: "lukka/[email protected].2"
 
       # Do this before building aar since it affects the version
       - name: Touch SNAPSHOT marker file
@@ -36,7 +36,7 @@ jobs:
         run: "./maintainer-scripts/build-aar.sh"
 
       - name: Upload bare AAR
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: AAR and POM
           path: openxr_loader_for_android*
@@ -47,12 +47,13 @@ jobs:
     steps:
       - uses: "actions/checkout@v4"
       - name: "Get modern CMake and Ninja"
-        uses: "lukka/[email protected].1"
+        uses: "lukka/[email protected].2"
       - name: "set up JDK 11"
         uses: "actions/setup-java@v4"
         with:
           java-version: "11"
           distribution: "temurin"
+      # Also performs Gradle wrapper validation
       - uses: "gradle/actions/setup-gradle@v4"
 
       # HelloXR OpenGLES version
@@ -61,7 +62,7 @@ jobs:
 
       - name: Upload HelloXR OpenGLES (debug) for Android
         if: "!inputs.release"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: HelloXR OpenGLES Android
           path: "src/tests/hello_xr/build/outputs/apk/OpenGLES/debug/*.apk"

.github/workflows/check_clang_format_and_codespell.yml

@@ -28,7 +28,7 @@ jobs:
         if: ${{ failure() }}
       - name: Publish diff
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ runner.temp }}/clang-format.patch
           name: clang-format-changes

.github/workflows/gradle-wrapper-validation.yml

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
+# Probably no longer needed as long as we have another Gradle build.
 name: Validate Gradle Wrapper
 
 on:

.github/workflows/msvc-build-preset.yml

@@ -1,4 +1,4 @@
-# Copyright 2021-2023, Collabora, Ltd.
+# Copyright 2021-2024, Collabora, Ltd.
 # SPDX-License-Identifier: CC0-1.0
 
 on:
@@ -34,7 +34,7 @@ jobs:
           lfs: true
 
       - name: Get modern CMake and Ninja
-        uses: lukka/[email protected].1
+        uses: lukka/[email protected].2
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
@@ -57,7 +57,7 @@ jobs:
         run: "cmake --build $env:RUNNER_TEMP --parallel --config ${{ inputs.buildType }} --target install"
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: inputs.artifactName
         with:
           name: "${{ inputs.artifactName }}"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# Copyright 2021-2022, Collabora, Ltd.
+# Copyright 2021-2024, Collabora, Ltd.
 # SPDX-License-Identifier: CC0-1.0
 
 name: Build release artifacts
@@ -8,13 +8,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  android:
-    uses: ./.github/workflows/android.yml
-    with:
-      release: true
+  # Currently Android artifacts are generated and signed internally before publication to GitHub.
+  # android:
+  #   uses: ./.github/workflows/android.yml
+  #   with:
+  #     release: true
 
   msvc-build:
     uses: ./.github/workflows/windows-matrix.yml
     with:
-      organizeAndRelease: true # TODO
-
+      organizeAndRelease: true

.github/workflows/windows-matrix.yml

@@ -50,15 +50,15 @@ jobs:
       - uses: "actions/checkout@v4"
 
       - name: Retrieve artifacts
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           path: artifacts
 
       - name: Organize artifacts
         run: 'python .github/scripts/organize_windows_artifacts.py "${{ github.workspace }}" "${{ github.workspace }}/openxr_loader"'
 
       - name: Upload combined artifact
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: openxr_loader_windows
           path: "${{ github.workspace }}/openxr_loader"
@@ -78,7 +78,7 @@ jobs:
         run: 'nuget pack "${{ github.workspace }}/openxr_loader_staging/OpenXR.Loader.nuspec" -OutputDirectory "${{ github.workspace }}/nuget"'
 
       - name: Upload NuGet artifact
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: NuGet
           path: "${{ github.workspace }}/nuget"