probably broken github actions

Author: LilithSilver

.github/actions/build-plugin/action.yml

@@ -6,14 +6,6 @@ inputs:
     required: true
     default: ''
     description: Rust target platform.
-  extra_flags:
-    required: false
-    default: ''
-    description: Rust extra flags.
-  features:
-    required: false
-    default: ''
-    description: simd-nightly,simd-stable,parallel,enhanced-determinism
 
 runs:
   using: composite
@@ -26,33 +18,27 @@ runs:
       shell: sh
       run: |
         rustc --print=target-list
-    - name: Rust Add target
+    - name: Add additional arm64 target for macOS
+      shell: sh
+      if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
+        rustup target add aarch64-apple-darwin
+    - name: Rust add current target
       shell: sh
       run: |
         rustup target add ${{ inputs.arch }}
-    #--features="${{ inputs.features }}" --no-default-features
-    - name: Build
+    - name: Build for Windows and Linux
       shell: sh
+      if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
+      run: |
+        just build-patchwork release ${{ inputs.arch }}
+    - name: Build for Mac
+      shell: sh
+      if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
       run: |
-        cargo build --target=${{ inputs.arch }} --release  ${{ inputs.extra_flags}}
+        just build-patchwork release "all-apple-darwin"
     - name: Copy to release
       shell: sh
       run: |
         mkdir -p target/release
         rm -rf target/release
         cp -rf target/${{ inputs.arch }}/release target/release
-    - name: Build Rapier Macos Universal
-      shell: sh
-      # we already built for x86_64-apple-darwin for mac, now build arm64
-      if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
-      run: |
-        mkdir -p target/release
-        rustup target add aarch64-apple-darwin
-        cargo build --target=aarch64-apple-darwin --release
-        lipo -create -output target/release/libpatchwork_rust_core.dylib target/aarch64-apple-darwin/release/libpatchwork_rust_core.dylib target/x86_64-apple-darwin/release/libpatchwork_rust_core.dylib
-    - name: Move Static Libs macOS
-      shell: sh
-      if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
-      run: |
-        mv target/x86_64-apple-darwin/release/libpatchwork_rust_core.a target/release/libpatchwork_rust_core.x86_64.a
-        mv target/aarch64-apple-darwin/release/libpatchwork_rust_core.a target/release/libpatchwork_rust_core.arm64.a

.github/workflows/all_editor_builds.yml

@@ -1,4 +1,4 @@
-name: Build Editor All Platforms
+name: 🤖 Build Godot for All Platforms
 on:
   workflow_call:
 
@@ -7,7 +7,8 @@ on:
 env:
   GODOT_REPOSITORY: godotengine/godot
   GODOT_BASE_BRANCH: master
-  # Change Developers.md too
+  # Change Developers.md and Justfile too
+  # TODO (Lilith): Input these values from a .env file in both justfile and here
   GODOT_MAIN_SYNC_REF: bb92a4c8e27e30cdec05ab6d540d724b9b3cfb72
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes deprecated=yes module_patchwork_editor_enabled=yes
   SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_camera_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_websocket_enabled=no module_csg_enabled=yes module_gridmap_enabled=yes use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes disable_3d=no
@@ -26,15 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "Windows Editor"
+          - name: "🪟 Build Godot for Windows"
             os: "windows-latest"
             id: windows-editor
             platform: windows
             target: editor
             sconsflags: tests=yes debug_symbols=yes
             bin: ./bin/godot.windows.editor.x86_64.exe
 
-          - name: "🐧 Linux Editor"
+          - name: "🐧 Build Godot for Linux"
             os: "ubuntu-22.04"
             id: linux-editor
             platform: linux
@@ -43,7 +44,7 @@ jobs:
             sconsflags-template: optimize=size use_lto=yes debug_symbols=no
             bin: ./bin/godot.linuxbsd.editor.x86_64
 
-          - name: "🍎 macOS Editor"
+          - name: "🍎 Build Godot for macOS"
             os: "macos-14"
             id: macos-editor
             platform: macos
@@ -58,16 +59,21 @@ jobs:
           repository: ${{env.GODOT_REPOSITORY}}
           ref: ${{env.GODOT_MAIN_SYNC_REF}}
 
-      - name: checkout-patchwork_editor
+      - name: checkout-patchwork-godot-plugin
         uses: actions/checkout@v4
         with:
-          path: modules/patchwork_editor
+          path: tmp/patchwork-godot-plugin
           fetch-depth: 0
+        
+      - name: copy editor directory
+        shell: bash
+        run: |
+          cp -R tmp/patchwork-godot-plugin/editor modules/patchwork_editor
 
       - name: copy actions
         shell: bash
         run: |
-          cp -R modules/patchwork_editor/.github/actions/* .github/actions/
+          cp -R tmp/patchwork-godot-plugin/.github/actions/* .github/actions/
 
       - name: Select Xcode 16
         if: matrix.platform == 'macos'
@@ -171,8 +177,8 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: matrix.id != 'linux-sanitizers'
         with:
-          name: patchwork_editor-${{ matrix.platform }}
-          path: ${{github.workspace}}/bin/*
+          name: godot-with-patchwork-${{ matrix.platform }}
+          path: ${{ github.workspace }}/bin/*
           retention-days: 90
 
   # test:
@@ -231,46 +237,3 @@ jobs:
   #       shell: bash
   #       run: |
   #         ${{matrix.bin}} --headless --test --force-colors "--test-case=[patchwork_editor]*"
-
-  release:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: "ubuntu-latest"
-    permissions:
-      contents: write
-    needs: [build]
-    steps:
-      - name: Download Linux artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: patchwork_editor-linux
-          path: artifacts/linux
-      - name: Download MacOS artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: patchwork_editor-macos
-          path: artifacts/macos
-      - name: Download Windows artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: patchwork_editor-windows
-          path: artifacts/windows
-      - name: Zip artifacts
-        run: |
-          ls -la artifacts/*
-          cd artifacts/windows
-          zip -r9  "../patchwork_editor-${{ github.ref_name }}-windows.zip" *
-          cd ../..
-          cd artifacts/macos
-          chmod a+x godot_macos_editor.app/Contents/MacOS/Godot
-          zip -r9  "../patchwork_editor-${{ github.ref_name }}-macos.zip" *
-          cd ../..
-          cd artifacts/linux
-          chmod a+x *
-          zip -r9  "../patchwork_editor-${{ github.ref_name }}-linux.zip" *
-      - name: Release
-        uses: nikitalita/action-gh-release@v1.0
-        with:
-          files: |
-            artifacts/patchwork_editor-${{ github.ref_name }}-windows.zip
-            artifacts/patchwork_editor-${{ github.ref_name }}-macos.zip
-            artifacts/patchwork_editor-${{ github.ref_name }}-linux.zip

.github/workflows/compose_projects.yml

@@ -0,0 +1,41 @@
+name: 🧵 Compose Projects
+on:
+  workflow_call:
+
+jobs:
+  compose-projects:
+    runs-on: "ubuntu-latest"
+    name: 🪡 Compose ${{ matrix.project.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # TODO (Lilith): Input these values from a .env file in both justfile and here
+        project:
+          - name: threadbare
+            repo: endlessm/threadbare
+            ref: godot-4.6
+          - name: moddable-platformer
+            repo: endlessm/moddable-platformer
+            ref: godot-4.6
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ matrix.project.repo }}
+          ref: ${{ matrix.project.ref }}
+          path: ${{ matrix.project.name }}
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Download Patchwork
+        uses: actions/download-artifact@v4
+        with:
+          pattern: patchwork-godot-plugin
+          path: ${{ matrix.project.name }}/addons/patchwork
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.project.name }}-with-patchwork
+          path: |
+            ${{ matrix.project.name }}
+          if-no-files-found: error
+

.github/workflows/linux_builds.yml

@@ -1,11 +1,11 @@
-name: 🐧 Linux Builds
+name: 🐧 Build Patchwork for Linux
 on:
   workflow_call:
 
 jobs:
   linux:
     runs-on: "ubuntu-22.04"
-    name: linux ${{ matrix.arch }}
+    name: 📐 Build ${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
@@ -15,10 +15,9 @@ jobs:
           #"armv7-unknown-linux-gnueabihf", # TODO: fix this, newer godot-rust is failing to build for arm32
           #"i686-unknown-linux-gnu"
         ]
-        include-static-libs: [false]
-
     steps:
       - uses: actions/checkout@v4
+
       - name: "Install dependencies"
         shell: sh
         run: |
@@ -43,25 +42,12 @@ jobs:
         uses: ./.github/actions/build-plugin
         with:
           arch: ${{ matrix.arch }}
-          # features: ${{ matrix.features.feature }},${{ matrix.precision }}-${{ matrix.dimensions.feature }}
-      - name: Copy to bin
-        shell: sh
-        run: |
-          mkdir -p rust/plugin/linux
-          cp target/release/libpatchwork_rust_core.so rust/plugin/linux/libpatchwork_rust_core.linux.${{ matrix.arch }}.so
-          ls -la rust/plugin/linux
-      - name: Copy static lib
-        if: ${{ matrix.include-static-libs }}
-        shell: sh
-        run: |
-          mkdir -p rust/plugin/linux
-          cp target/release/libpatchwork_rust_core.a rust/plugin/linux/libpatchwork_rust_core.linux.${{ matrix.arch }}.a
-          ls -la rust/plugin/linux
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: patchwork-godot-linux-${{ matrix.arch }}
+          name: patchwork-build-linux-${{ matrix.arch }}
           path: |
-            rust/plugin/linux/*
+            build/patchwork/*
           if-no-files-found: error
 

.github/workflows/macos_builds.yml

@@ -1,4 +1,4 @@
-name: 🍎 macOS Builds
+name: 🍎 Build Patchwork for macOS
 on:
   workflow_call:
 
@@ -8,17 +8,14 @@ env:
 jobs:
   macos:
     runs-on: "macos-14"
-    name:  ${{ matrix.arch }}
+    name: 📐 Build ${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
         arch:  ["x86_64-apple-darwin"]
-        include-static-libs: [false]
-
     steps:
       - uses: actions/checkout@v4
 
-      # restore cache
       - name: Restore Cache
         uses: Swatinem/rust-cache@v2
         with:
@@ -28,39 +25,23 @@ jobs:
         uses: ./.github/actions/build-plugin
         with:
           arch: ${{ matrix.arch }}
-          # features: ${{ matrix.features.feature }},${{ matrix.precision }}-${{ matrix.dimensions.feature }}
-
-      - name: Copy to bin
-        shell: sh
-        run: |
-          mkdir -p rust/plugin/macos/libpatchwork_rust_core.macos.framework
-          cp target/release/libpatchwork_rust_core.dylib rust/plugin/macos/libpatchwork_rust_core.macos.framework/libpatchwork_rust_core.macos.dylib
-          ls -la rust/plugin/macos/libpatchwork_rust_core.macos.framework
-
-      - name: Copy static libs
-        if: ${{ matrix.include-static-libs }}
-        shell: sh
-        run: |
-          mkdir -p rust/plugin/macos/libpatchwork_rust_core.macos.framework
-          cp target/release/libpatchwork_rust_core.arm64.a rust/plugin/macos/libpatchwork_rust_core.macos.framework/libpatchwork_rust_core.macos.arm64.a
-          cp target/release/libpatchwork_rust_core.x86_64.a rust/plugin/macos/libpatchwork_rust_core.macos.framework/libpatchwork_rust_core.macos.x86_64.a
-          ls -la rust/plugin/macos/libpatchwork_rust_core.macos.framework
 
       - name: Mac Sign
         uses: ./.github/actions/macos-sign
         with:
-          FRAMEWORK_PATH: ${{ github.workspace }}/rust/plugin/macos/libpatchwork_rust_core.macos.framework
+          FRAMEWORK_PATH: ${{ github.workspace }}/build/patchwork/bin/libpatchwork_rust_core.macos.framework
           SIGN_FLAGS: "--deep"
           APPLE_CERT_BASE64: ${{ secrets.APPLE_CERT_BASE64 }}
           APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }}
           APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
           APPLE_DEV_ID: ${{ secrets.APPLE_DEV_ID }}
           APPLE_DEV_TEAM_ID: ${{ secrets.APPLE_DEV_TEAM_ID }}
           APPLE_DEV_APP_ID: ${{ secrets.APPLE_DEV_APP_ID }}
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: patchwork-godot-macos-${{ matrix.arch}}
+          name: patchwork-build-macos-${{ matrix.arch }}
           path: |
-            rust/plugin/macos/**/*
+            build/patchwork/*
           if-no-files-found: error

.github/workflows/merge_builds.yml

@@ -0,0 +1,36 @@
+name: 🧩 Merge Patchwork Builds
+on:
+  workflow_call:
+
+jobs:
+  merge-builds:
+    runs-on: "ubuntu-latest"
+    name: 🧩 Merge Patchwork Builds
+    strategy:
+      fail-fast: false
+      matrix:
+        # TODO (Lilith): Input these values from a .env file in both justfile and here
+        project:
+          - name: threadbare
+            repo: endlessm/threadbare
+            ref: godot-4.6
+          - name: moddable-platformer
+            repo: endlessm/moddable-platformer
+            ref: godot-4.6
+    steps:
+      # just download the artifacts from the macos, windows and linux plugin builds
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: patchwork-build-*
+          path: ${{ GITHUB_WORKSPACE }}/patchwork-godot-plugin
+          merge-multiple: true
+      - name: Wut
+        run: |
+          ls -la ${{ GITHUB_WORKSPACE }}/patchwork-godot-plugin/bin || echo "No artifacts"
+
+      - name: Upload patchwork-godot-plugin
+        uses: actions/upload-artifact@v4
+        with:
+          path: patchwork-godot-plugin
+          name: patchwork-godot-plugin