Merge branch 'main' into 1-0-0-head-rel

.github/workflows/build_dependencies.yml

@@ -6,6 +6,7 @@ on:
       - main
       - dev_9
       - codespace-opulent-parakeet-r64rrvrvw7jhx5vp
+      - backup
     paths:
       - 'deps/**'
       - '.github/workflows/**'

.github/workflows/build_dependencies_macOS_arm64.yml

@@ -0,0 +1,48 @@
+name: Build dependencies (macOS arm64)
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'deps/**'
+      - '.github/workflows/**'
+  push:
+    branches:
+      - main
+    paths:
+      - 'deps/**'
+      - '.github/workflows/**'
+
+jobs:
+  build_osx_arm64:
+    name: Build dependencies (macOS arm64)
+    runs-on: macos-arm64
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # Build macOS arm64 dependencies
+      - name: Build on macOS arm64
+        working-directory: ${{ github.workspace }}
+        run: |
+            brew install cmake git gettext automake
+            mkdir -p ${{ github.workspace }}/deps/build_arm64
+            mkdir -p ${{ github.workspace }}/deps/build_arm64/GalaxySlicer_dep_arm64
+            ./build_release_macos.sh -d -a arm64
+           
+      - name: Cleaning up the macOS arm64 Build Directory
+        working-directory: ${{ github.workspace }}/deps/build_arm64
+        run: |
+            rm -r dep_*
+          
+      - name: Pack macOS arm64 dependencies
+        working-directory: ${{ github.workspace }}/deps/build_arm64
+        run: 'tar cfvz GalaxySlicer_dep_arm64.tar.gz GalaxySlicer_dep_arm64'
+
+      - name: Upload macOS arm64 dependencies
+        uses: actions/upload-artifact@v3
+        with:
+          name: GalaxySlicer_dep_arm64
+          path: ${{ github.workspace }}/deps/build_arm64/GalaxySlicer_dep_arm64.tar.gz

.github/workflows/build_deps.yml

@@ -61,7 +61,7 @@ jobs:
         run: |
             choco install strawberryperl
             mkdir ${{ github.workspace }}/deps/build
-            mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+            mkdir ${{ github.workspace }}/deps/build/GalaxySlicer_dep
             .\build_release_vs2022.bat deps
             .\build_release_vs2022.bat pack
             cd ${{ github.workspace }}/deps/build
@@ -78,6 +78,11 @@ jobs:
             ./build_release_macos.sh -dp -a ${{ inputs.arch }} -t 10.15
             brew install zstd
 
+            brew install cmake git gettext automake
+            brew list
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/GalaxySlicer_dep_${{ inputs.arch }}
+            ./build_release_macos.sh -dp -a ${{ inputs.arch }}
 
       - name: Build on Ubuntu
         if: inputs.os == 'ubuntu-20.04'
@@ -95,23 +100,23 @@ jobs:
             sudo chown $USER -R ./
             ./BuildLinux.sh -dr
             cd deps/build
-            tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
+            tar -czvf GalaxySlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
       
 
       # Upload Artifacts
       - name: Upload Mac ${{ inputs.arch }} artifacts
         if: inputs.os == 'macos-12'
         uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
+          name: GalaxySlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/GalaxySlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
         if: inputs.os == 'windows-latest'
         uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_dep_win64_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
+          name: GalaxySlicer_dep_win64_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build/GalaxySlicer_dep*.zip
 
       - name: Upload Ubuntu artifacts
         if: inputs.os == 'ubuntu-20.04'
@@ -131,4 +136,18 @@ jobs:
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
     secrets: inherit
+          name: GalaxySlicer_dep_ubuntu_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build/GalaxySlicer_dep_ubuntu_*.tar.gz
+
+#  build_orca:
+#    name: Build GalaxySlicer
+#    needs: [build_deps]
+#    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
+#    uses: ./.github/workflows/build_orca.yml
+#    with:
+#      cache-key: ${{ inputs.cache-key }}
+#      cache-path: ${{ inputs.cache-path }}
+#      os: ${{ inputs.os }}
+#      arch: ${{ inputs.arch }}
+#    secrets: inherit