Merge remote-tracking branch 'remotes/local/dev' into nightly_dev

supermerill · Oct 13, 2024 · a15ac5f · a15ac5f
2 parents 86a4e64 + 762caee
commit a15ac5f
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml
@@ -26,12 +26,12 @@ jobs:
         hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
         hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos.app
         path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos.dmg
         path: ${{ github.event.repository.name }}.dmg
diff --git a/.github/workflows/ccpp_mac_arm.yml b/.github/workflows/ccpp_mac_arm.yml
@@ -18,12 +18,12 @@ jobs:
     - name: build deps & slicer
       run: ./BuildMacOS.sh -ia
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos_arm_debug.dmg
         path: build/${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_arm_macos.tar
         path: build/${{ github.event.repository.name }}.tar
diff --git a/.github/workflows/ccpp_mac_arm_debug.yml b/.github/workflows/ccpp_mac_arm_debug.yml
@@ -20,12 +20,12 @@ jobs:
       working-directory: ./build
       run: ls
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos_arm_debug.dmg
         path: build/${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_arm_macos.tar
         path: build/${{ github.event.repository.name }}.tar
diff --git a/.github/workflows/ccpp_mac_arm_rc.yml b/.github/workflows/ccpp_mac_arm_rc.yml
@@ -17,12 +17,12 @@ jobs:
     - name: build deps & slicer
       run: ./BuildMacOS.sh -ia
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_arm_macos.dmg
         path: build/${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_arm_macos.tar
         path: build/${{ github.event.repository.name }}.tar
diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml
@@ -28,12 +28,12 @@ jobs:
       working-directory: ./build
       run: ls
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos_debug.dmg
         path: build/${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_macos.tar
         path: ${{ github.event.repository.name }}.tar
diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml
@@ -24,12 +24,12 @@ jobs:
         hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg
         hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_macos.app
         path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_macos.dmg
         path: ${{ github.event.repository.name }}.dmg
diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
@@ -39,12 +39,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_linux_gtk2.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: ${{ github.event.repository.name }}-gtk2.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
@@ -38,12 +38,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_linux_gtk2.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: ${{ github.event.repository.name }}-gtk2.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
diff --git a/.github/workflows/ccpp_ubuntu_gtk3.yml b/.github/workflows/ccpp_ubuntu_gtk3.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
@@ -39,12 +39,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_linux_gtk3.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: ${{ github.event.repository.name }}-gtk3.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
diff --git a/.github/workflows/ccpp_ubuntu_gtk3_debug.yml b/.github/workflows/ccpp_ubuntu_gtk3_debug.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
@@ -38,12 +38,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_linux_gtk3.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: ${{ github.event.repository.name }}-gtk3.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage

diff --git a/.github/workflows/ccpp_ubuntu_gtk3_rc.yml b/.github/workflows/ccpp_ubuntu_gtk3_rc.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       EXEC_NAME: "${{ github.event.repository.name }}"
@@ -40,12 +40,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_linux_gtk3.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc-${{ github.event.repository.name }}-gtk3.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
diff --git a/.github/workflows/ccpp_ubuntu_rc.yml b/.github/workflows/ccpp_ubuntu_rc.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
@@ -38,12 +38,12 @@ jobs:
       working-directory: ./build
       run: src/BuildLinuxImage.sh -i
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_linux_gtk2.tar
         path: build/${{ github.event.repository.name }}.tar
     - name: Upload appimage
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc-${{ github.event.repository.name }}-gtk2.AppImage
         path: build/${{ github.event.repository.name }}_ubu64.AppImage
diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml
@@ -99,7 +99,7 @@ jobs:
 #      shell: cmd
 #      run: '"C:/Program Files/7-Zip/7z.exe" a -tzip nightly.zip *'
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_win64
         path: build/package/
diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml
@@ -69,7 +69,7 @@ jobs:
         cmake .. -G "Visual Studio 16 2019" -A x64
         msbuild /m ALL_BUILD.vcxproj
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: deps_win
         path: ./deps/build/destdir/
@@ -160,7 +160,7 @@ jobs:
 #      shell: cmd
 #      run: '"C:/Program Files/7-Zip/7z.exe" a -tzip nightly.zip *'
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_win64_debug
         path: build/package/
diff --git a/.github/workflows/ccpp_win_deps.yml b/.github/workflows/ccpp_win_deps.yml
@@ -20,7 +20,7 @@ jobs:
         cmake .. -G "Visual Studio 16 2019" -A x64
         msbuild /m ALL_BUILD.vcxproj
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: deps_win
         path: ./deps/build/destdir/
@@ -112,7 +112,7 @@ jobs:
 #      shell: cmd
 #      run: '"C:/Program Files/7-Zip/7z.exe" a -tzip nightly.zip *'
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: nightly_win64
         path: build/package/
diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml
@@ -99,7 +99,7 @@ jobs:
 #      shell: cmd
 #      run: '"C:/Program Files/7-Zip/7z.exe" a -tzip nightly.zip *'
     - name: Upload artifact
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v4.0.0
       with:
         name: rc_win64
         path: build/package/