Merge pull request #8 from DmitriySalnikov/test_build

simplified build script
DmitriySalnikov · Jan 17, 2023 · fd25466 · fd25466
2 parents efe7142 + 5a7e7d4
commit fd25466
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 55 deletions.
diff --git a/.github/actions/compile_gdextension/action.yml b/.github/actions/compile_gdextension/action.yml
@@ -22,6 +22,13 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Setup build cache
+      uses: ./.github/actions/gdextension_cache
+      with:
+        config: ${{inputs.arch}}_${{inputs.target}}
+        scons-cache: ${{env.SCONS_CACHE}}
+      continue-on-error: true
+
     - name: Set up Python 3.x
       uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/gdextension_build.yml b/.github/workflows/gdextension_build.yml
@@ -40,13 +40,6 @@ jobs:
           lfs: true
           submodules: recursive
 
-      - name: Setup build cache
-        uses: ./.github/actions/gdextension_cache
-        with:
-          config: ${{matrix.arch}}_${{matrix.target}}
-          scons-cache: ${{env.SCONS_CACHE}}
-        continue-on-error: true
-
       - name: Compile GDExtension
         uses: ./.github/actions/compile_gdextension
         with:
@@ -75,13 +68,6 @@ jobs:
           lfs: true
           submodules: recursive
 
-      - name: Setup build cache
-        uses: ./.github/actions/gdextension_cache
-        with:
-          config: ${{matrix.arch}}_${{matrix.target}}
-          scons-cache: ${{env.SCONS_CACHE}}
-        continue-on-error: true
-
       - name: Compile GDExtension
         uses: ./.github/actions/compile_gdextension
         with:
@@ -110,13 +96,6 @@ jobs:
           lfs: true
           submodules: recursive
 
-      - name: Setup build cache
-        uses: ./.github/actions/gdextension_cache
-        with:
-          config: ${{matrix.arch}}_${{matrix.target}}
-          scons-cache: ${{env.SCONS_CACHE}}
-        continue-on-error: true
-
       - name: Compile GDExtension
         uses: ./.github/actions/compile_gdextension
         with:
@@ -148,13 +127,6 @@ jobs:
           lfs: true
           submodules: recursive
 
-      - name: Setup build cache
-        uses: ./.github/actions/gdextension_cache
-        with:
-          config: ${{matrix.arch}}_${{matrix.target}}
-          scons-cache: ${{env.SCONS_CACHE}}
-        continue-on-error: true
-
       - name: Compile GDExtension
         uses: ./.github/actions/compile_gdextension
         with:
@@ -163,3 +135,23 @@ jobs:
           arch: ${{matrix.arch}}
           output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
           artifact: android
+
+  # ============================================
+
+  collect-gdextension:
+    needs: [windows-gdextension, linux-gdextension, macos-gdextension, android-gdextension]
+    name: 📦 Collect GDExtension binaries
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download Binaries
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          path: extracted_files
+
+      - name: Upload GDExtension
+        uses: actions/upload-artifact@v3
+        with:
+          name: gdextension_libs
+          retention-days: 7
+          path: extracted_files/*
diff --git a/.github/workflows/util_collect_binaries.yml b/.github/workflows/util_collect_binaries.yml
diff --git a/.github/workflows/util_update_libs.yml b/.github/workflows/util_update_libs.yml
@@ -1,4 +1,4 @@
-name: 2. ↗️ Update GDExtension binaries from collected artifacts
+name: ↗️ Update GDExtension binaries from collected artifacts
 run-name: "Update on '${{github.ref_name}}' '${{github.sha}}' #${{github.run_number}}"
 
 on:
@@ -22,7 +22,7 @@ jobs:
       - name: Download GDExtension Binaries
         uses: dawidd6/action-download-artifact@v2
         with:
-          workflow: util_collect_binaries.yml
+          workflow: gdextension_build.yml
           branch: ${{github.ref_name}}
           name: gdextension_libs
           path: extracted_files/