Adjust CI to include 4.2 builds

Update artifact naming scheme to be more consistent.

Author: Bromeon

.github/composite/godot-install/action.yml

@@ -44,12 +44,10 @@ runs:
       # If a specific Godot revision should be used, rather than latest, use this:
       # curl https://nightly.link/Bromeon/godot4-nightly/actions/runs/4910907653/${{ inputs.artifact-name }}.zip \
       run: |
-        if [[ $ARTIFACT_NAME == *"stable"* ]]; then
-          url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-stable/master/$ARTIFACT_NAME.zip"
-        elif [[ $ARTIFACT_NAME == *"4.0.4"* ]]; then
-          url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-4.0/master/$ARTIFACT_NAME.zip"
-        else
+        if [[ $ARTIFACT_NAME == *"nightly"* ]]; then
           url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-nightly/master/$ARTIFACT_NAME.zip"
+        else
+          url="https://nightly.link/Bromeon/godot4-nightly/workflows/compile-godot-stable/master/$ARTIFACT_NAME.zip"
         fi
         
         curl "$url" -Lo artifact.zip --retry 3

.github/workflows/full-ci.yml

@@ -171,18 +171,17 @@ jobs:
             godot-binary: godot.macos.editor.dev.double.x86_64
             rust-extra-args: --features godot/custom-godot,godot/double-precision
 
-          - name: macos-4.1
+          - name: macos-4.2
             os: macos-12
-            artifact-name: macos-stable
+            artifact-name: macos-4.2
             godot-binary: godot.macos.editor.dev.x86_64
-            #godot-prebuilt-patch: '4.1'
+#            godot-prebuilt-patch: '4.2.x'
 
-          # TODO merge with other jobs
-          - name: macos-lazy-fptrs
+          - name: macos-4.1
             os: macos-12
-            artifact-name: macos-nightly
+            artifact-name: macos-4.1
             godot-binary: godot.macos.editor.dev.x86_64
-            rust-extra-args: --features godot/lazy-function-tables
+            godot-prebuilt-patch: '4.1.3'
 
           # Windows
 
@@ -198,18 +197,17 @@ jobs:
             godot-binary: godot.windows.editor.dev.double.x86_64.exe
             rust-extra-args: --features godot/custom-godot,godot/double-precision
 
-          - name: windows-4.1
+          - name: windows-4.2
             os: windows-latest
-            artifact-name: windows-stable
+            artifact-name: windows-4.2
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            #godot-prebuilt-patch: '4.1'
+            #godot-prebuilt-patch: '4.2.x'
 
-          # TODO merge with other jobs
-          - name: windows-lazy-fptrs
+          - name: windows-4.1
             os: windows-latest
-            artifact-name: windows-nightly
+            artifact-name: windows-4.1
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            rust-extra-args: --features godot/lazy-function-tables
+            godot-prebuilt-patch: '4.1.3'
 
           # Linux
 
@@ -242,21 +240,21 @@ jobs:
 
           # Linux compat
 
-          - name: linux-4.1.1
+          - name: linux-4.2
             os: ubuntu-20.04
-            artifact-name: linux-stable
+            artifact-name: linux-4.2
             godot-binary: godot.linuxbsd.editor.dev.x86_64
-            #godot-prebuilt-patch: '4.1.1'
+            #godot-prebuilt-patch: '4.2.x'
 
           - name: linux-4.1
             os: ubuntu-20.04
-            artifact-name: linux-stable
+            artifact-name: linux-4.2
             godot-binary: godot.linuxbsd.editor.dev.x86_64
-            godot-prebuilt-patch: '4.1'
+            godot-prebuilt-patch: '4.1.3'
 
-          - name: linux-4.0.4
+          - name: linux-4.0
             os: ubuntu-20.04
-            artifact-name: linux-4.0.4
+            artifact-name: linux-4.0
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.0.4'
 
@@ -268,19 +266,29 @@ jobs:
           # cause false positives like println!. See https://github.com/google/sanitizers/issues/89.
           #
           # There is also a gcc variant besides clang, which is currently not used.
-          - name: linux-memcheck
+          - name: linux-memcheck-nightly
             os: ubuntu-20.04
-            artifact-name: linux-memcheck-clang-nightly
+            artifact-name: linux-memcheck-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
             rust-toolchain: nightly
             rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
             rust-extra-args: --features godot/custom-godot
             # Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.
             rust-target: x86_64-unknown-linux-gnu
 
-          - name: linux-memcheck-4.0.4
+          - name: linux-memcheck-4.1
+            os: ubuntu-20.04
+            artifact-name: linux-memcheck-4.1
+            godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
+            godot-prebuilt-patch: '4.1.3'
+            rust-toolchain: nightly
+            rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
+            # Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.
+            rust-target: x86_64-unknown-linux-gnu
+
+          - name: linux-memcheck-4.0
             os: ubuntu-20.04
-            artifact-name: linux-memcheck-clang-4.0.4
+            artifact-name: linux-memcheck-4.0
             godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
             godot-prebuilt-patch: '4.0.4'
             rust-toolchain: nightly

.github/workflows/minimal-ci.yml

@@ -161,27 +161,33 @@ jobs:
 
           # Linux compat
 
+          - name: linux-4.1.3
+            os: ubuntu-20.04
+            artifact-name: linux-4.1
+            godot-binary: godot.linuxbsd.editor.dev.x86_64
+            godot-prebuilt-patch: '4.1.3'
+
           - name: linux-4.0.4
             os: ubuntu-20.04
-            artifact-name: linux-4.0.4
+            artifact-name: linux-4.0
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.0.4'
 
           # Memory checkers
 
           - name: linux-memcheck
             os: ubuntu-20.04
-            artifact-name: linux-memcheck-clang-nightly
+            artifact-name: linux-memcheck-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
             rust-toolchain: nightly
             rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
             rust-extra-args: --features godot/custom-godot
             # Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.
             rust-target: x86_64-unknown-linux-gnu
 
-          - name: linux-memcheck-4.0.4
+          - name: linux-memcheck-4.0
             os: ubuntu-20.04
-            artifact-name: linux-memcheck-clang-4.0.4
+            artifact-name: linux-memcheck-4.0
             godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
             godot-prebuilt-patch: '4.0.4'
             rust-toolchain: nightly