Single double.

V-Sekai · Oct 30, 2024 · 99aa0f0 · 99aa0f0
1 parent b399bf4
commit 99aa0f0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -22,11 +22,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        precision: [single, double]
         platform: [macos]
         target: [editor, template_release, template_debug]
 
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.platform }}-${{ matrix.target }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
       cancel-in-progress: true
 
     steps:
@@ -51,8 +52,9 @@ jobs:
         with: 
           path: | 
             .scons_cache
-          key: ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }} 
+          key: ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           restore-keys: | 
+            ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}  
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}  
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}  
@@ -80,24 +82,24 @@ jobs:
           --github-actions '${{ secrets.GITHUB_TOKEN }}' \
           --ci-only-on-alert \
           --file results.json \
-          "hyperfine --show-output --runs 1 --export-json results.json 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }}'" 
+          "hyperfine --show-output --runs 1 --export-json results.json 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }} ${{ matrix.precision }}'" 
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.platform }}-${{ matrix.target }}
+          name: build-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           path: godot/bin/*
 
       - name: Upload TPZ File
         uses: actions/upload-artifact@v4
         with:
-          name: Godot-${{ matrix.platform }}-${{ matrix.target }}.tpz
+          name: Godot-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}.tpz
           path: tpz
 
       - name: Upload Godot Editor Files
         uses: actions/upload-artifact@v4
         with:
-          name: Godot-${{ matrix.platform }}-${{ matrix.target }}
+          name: Godot-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           path: editor
   build:
     runs-on: ubuntu-latest
@@ -115,11 +117,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        precision: [single, double]
         platform: [linux, windows, android, web]
         target: [editor, template_release, template_debug]
 
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.platform }}-${{ matrix.target }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
       cancel-in-progress: true
 
     steps:
@@ -150,9 +153,10 @@ jobs:
             android_sdk  
             vulkan_sdk  
             mingw 
-          key: ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }} 
+          key: ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           restore-keys: | 
-            ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}  
+            ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
+            ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}  
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}  
             ${{ env.CACHE_NAME }}-${{ env.GODOT_BASE_BRANCH }}-refs/heads/${{ env.GODOT_BASE_BRANCH }}  
@@ -197,24 +201,24 @@ jobs:
           --github-actions '${{ secrets.GITHUB_TOKEN }}' \
           --ci-only-on-alert \
           --file results.json \
-          "hyperfine --show-output --runs 1 --export-json results.json 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }}'" 
+          "hyperfine --show-output --runs 1 --export-json results.json 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }} ${{ matrix.precision }}'" 
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.platform }}-${{ matrix.target }}
+          name: build-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           path: godot/bin/*
 
       - name: Upload TPZ File
         uses: actions/upload-artifact@v4
         with:
-          name: Godot-${{ matrix.platform }}-${{ matrix.target }}.tpz
+          name: Godot-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}.tpz
           path: tpz
 
       - name: Upload Godot Editor Files
         uses: actions/upload-artifact@v4
         with:
-          name: Godot-${{ matrix.platform }}-${{ matrix.target }}
+          name: Godot-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.precision }}
           path: editor
 
   merge:

diff --git a/Justfile b/Justfile
@@ -135,7 +135,7 @@ generate_build_constants:
     echo "const BUILD_UNIX_TIME = $(shell date +%s)" >> v/addons/vsk_version/build_constants.gd
 
 
-build-platform-target platform target:
+build-platform-target platform target precision="double":
     #!/usr/bin/env bash
     cd $WORLD_PWD
     export PATH=$MINGW_ROOT/bin:$PATH
@@ -157,7 +157,7 @@ build-platform-target platform target:
     scons platform={{platform}} \
           werror=no \
           compiledb=yes \
-          precision=double \
+          precision={{precision}} \
           target={{target}} \
           test=yes \
           debug_symbol=yes \