The build process has been improved to include more detailed flags.

V-Sekai · Jun 24, 2024 · c2d744d · c2d744d
1 parent b16d459
commit c2d744d
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/.github/actions/godot-build/action.yml b/.github/actions/godot-build/action.yml
@@ -45,20 +45,29 @@ runs:
         SCONS_CACHE: ${{ inputs.scons-cache }}
         SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }}
       run: |
-        WORKING_DIR=$(pwd)
-        ls -l $WORKING_DIR
-        mkdir -p $WORKING_DIR/bin $WORKING_DIR/modules/mono/glue 
-        cd $WORKING_DIR/godot
+        echo "Building with flags:" platform=${{ inputs.platform }} target=${{ inputs.target }} tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }}
+
+        if [ "${{ inputs.target }}" != "editor" ]; then
+          # Ensure we don't include editor code in export template builds.
+          rm -rf editor
+        fi
+
+        if [ "${{ github.event.number }}" != "" ]; then
+          # Set build identifier with pull request number if available. This is displayed throughout the editor.
+          export BUILD_NAME="gh-${{ github.event.number }}"
+        else
+          export BUILD_NAME="gh"
+        fi
+
         if [[ "${{ inputs.deploy }}" == "true" ]]; then
-          PLATFORM=${{ inputs.deploy-platform }}
-          TARGET=${{ inputs.deploy-platform-target }}
+          export PLATFORM=${{ inputs.deploy-platform }}
+          export TARGET=${{ inputs.deploy-platform-target }}
+          export ARCH=${{ inputs.deploy-arch }}
         else
-          PLATFORM=${{ inputs.platform }}
-          TARGET=${{ inputs.target }}
+          export PLATFORM=${{ inputs.platform }}
+          export TARGET=${{ inputs.target }}
+          export ARCH=${{ inputs.build-arch }}
         fi
-        echo "Building with flags:" platform=$PLATFORM target=$TARGET tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }}
-        if [ "$TARGET" != "editor" ]; then rm -rf editor; fi  # Ensure we don't include editor code.
-        scons platform=$PLATFORM target=$TARGET tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }}
-        cp -r $WORKING_DIR/godot/bin/* $WORKING_DIR/bin        
-        cp -r $WORKING_DIR/godot/modules/mono/glue/* $WORKING_DIR/modules/mono/glue
-        ls -l $WORKING_DIR/bin
+
+        scons platform=$PLATFORM target=$TARGET tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }} arch=$ARCH
+        ls -l bin/