From 9d21133773cd3680649b3ed74e7f4da4d3594d79 Mon Sep 17 00:00:00 2001 From: Vladimir Khodygo Date: Sat, 25 Mar 2023 11:06:34 +0000 Subject: [PATCH] CI: update actions --- .github/workflows/ccpp_mac.yml | 4 +- .github/workflows/ccpp_mac_arm.yml | 4 +- .github/workflows/ccpp_mac_arm_debug.yml | 6 +-- .github/workflows/ccpp_mac_arm_rc.yml | 4 +- .github/workflows/ccpp_mac_debug.yml | 6 +-- .github/workflows/ccpp_mac_rc.yml | 6 +-- .github/workflows/ccpp_ubuntu.yml | 31 ++++++++----- .github/workflows/ccpp_ubuntu_debug.yml | 34 ++++++++------ .github/workflows/ccpp_ubuntu_gtk3.yml | 46 ------------------- .github/workflows/ccpp_ubuntu_gtk3_debug.yml | 46 ------------------- .github/workflows/ccpp_ubuntu_gtk3_rc.yml | 47 -------------------- .github/workflows/ccpp_ubuntu_rc.yml | 36 +++++++++------ .github/workflows/ccpp_win.yml | 8 ++-- .github/workflows/ccpp_win_debug.yml | 10 ++--- .github/workflows/ccpp_win_rc.yml | 10 ++--- 15 files changed, 92 insertions(+), 206 deletions(-) delete mode 100644 .github/workflows/ccpp_ubuntu_gtk3.yml delete mode 100644 .github/workflows/ccpp_ubuntu_gtk3_debug.yml delete mode 100644 .github/workflows/ccpp_ubuntu_gtk3_rc.yml diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index b198e85a7fb..a627f698e3e 100644 --- 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@v3 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@v3 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 index 710e70a29e1..211f53b42d3 100644 --- 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@v3 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@v3 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 index eabd6ecd364..d6c17e88106 100644 --- a/.github/workflows/ccpp_mac_arm_debug.yml +++ b/.github/workflows/ccpp_mac_arm_debug.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-11 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'debug_macos' - name: build deps & slicer @@ -20,12 +20,12 @@ jobs: working-directory: ./build run: ls - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 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@v3 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 index 9cc5bd1df7c..9d0be81fb51 100644 --- a/.github/workflows/ccpp_mac_arm_rc.yml +++ b/.github/workflows/ccpp_mac_arm_rc.yml @@ -11,13 +11,13 @@ jobs: runs-on: macos-11 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'rc' - name: build deps & slicer run: ./BuildMacOS.sh -ia - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 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 index f43b8296a03..c259b38bc1b 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.github/workflows/ccpp_mac_debug.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'debug_macos' - name: build deps & slicer @@ -28,12 +28,12 @@ jobs: working-directory: ./build run: ls - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 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@v3 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 index 2e3d904d0d4..6afd50a92e6 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -12,7 +12,7 @@ jobs: runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'rc' - name: build deps & slicer @@ -61,12 +61,12 @@ jobs: codesign -vvv --deep --strict ./build/pack/SuperSlicer/SuperSlicer.app codesign -dvv ./build/pack/SuperSlicer/SuperSlicer.app - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: name: rc_macos.app path: build/pack/SuperSlicer/SuperSlicer.app - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: name: rc_macos.dmg path: build/SuperSlicer.dmg diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 7b1039fae68..6adaac49bbb 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -11,36 +11,43 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 + + - name: update apt cache & install packages + run: sudo apt update && sudo apt -y install git cmake libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext + - name: update submodule profiles working-directory: ./resources/profiles run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + - name: update clock run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk2 glew - run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev + + - name: change date in version + run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + - name: build deps & slicer - run: ./BuildLinux.sh -dgs + run: ./BuildLinux.sh -ds + - name: make .pot working-directory: ./build run: make gettext_make_pot + - name: build tar & appimage working-directory: ./build run: src/BuildLinuxImage.sh -i + - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: nightly_linux_gtk2.tar + name: nightly_linux.tar path: build/${{ github.event.repository.name }}.tar + - name: Upload appimage - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: ${{ github.event.repository.name }}-gtk2.AppImage + name: ${{ github.event.repository.name }}.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 index ce44929bf2a..260d7bdbfb1 100644 --- a/.github/workflows/ccpp_ubuntu_debug.yml +++ b/.github/workflows/ccpp_ubuntu_debug.yml @@ -8,38 +8,46 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'debug_ubuntu' + + - name: update apt cache & install packages + run: sudo apt update && sudo apt -y install git cmake libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext libssl-dev libcurl4-openssl-dev + - name: update submodule profiles working-directory: ./resources/profiles run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + - name: update clock run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk2 glew - run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev + + - name: change date in version + run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + - name: build deps & slicer - run: ./BuildLinux.sh -bdgs + run: ./BuildLinux.sh -bds + - name: make .pot working-directory: ./build run: make gettext_make_pot + - name: build tar & appimage working-directory: ./build run: src/BuildLinuxImage.sh -i + - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: nightly_linux_gtk2.tar + name: nightly_linux.tar path: build/${{ github.event.repository.name }}.tar + - name: Upload appimage - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: ${{ github.event.repository.name }}-gtk2.AppImage + name: ${{ github.event.repository.name }}.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 deleted file mode 100644 index 98e3014a60e..00000000000 --- a/.github/workflows/ccpp_ubuntu_gtk3.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: C/C++ Nightly ubuntu-GTK3 - -on: - push: - branches: - - Nigthly - - nightly_dev - - nightly_master - - debug_ubuntu - -jobs: - build: - - runs-on: ubuntu-18.04 - - steps: - - uses: actions/checkout@v3 - - name: update submodule profiles - working-directory: ./resources/profiles - run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - - name: update clock - run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk3 glew - run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev - - name: build deps & slicer - run: ./BuildLinux.sh -ds - - name: make .pot - working-directory: ./build - run: make gettext_make_pot - - name: build tar & appimage - working-directory: ./build - run: src/BuildLinuxImage.sh -i - - name: Upload artifact - uses: actions/upload-artifact@v1.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 - 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 deleted file mode 100644 index 1e14f60a30a..00000000000 --- a/.github/workflows/ccpp_ubuntu_gtk3_debug.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: C/C++ debug ubuntu-GTK3 - -on: - push: - branches: - - debug_ubuntu - -jobs: - build: - - runs-on: ubuntu-18.04 - - steps: - - uses: actions/checkout@v2 - with: - ref: 'debug_ubuntu' - - name: update submodule profiles - working-directory: ./resources/profiles - run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - - name: update clock - run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk3 glew - run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev - - name: build deps & slicer - run: ./BuildLinux.sh -bds - - name: make .pot - working-directory: ./build - run: make gettext_make_pot - - name: build tar & appimage - working-directory: ./build - run: src/BuildLinuxImage.sh -i - - name: Upload artifact - uses: actions/upload-artifact@v1.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 - 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 deleted file mode 100644 index 20c75be5cb5..00000000000 --- a/.github/workflows/ccpp_ubuntu_gtk3_rc.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: C/C++ Release candidate ubuntu-GTK3 - -on: - push: - branches: - - rc - -jobs: - build: - - runs-on: ubuntu-18.04 - - env: - EXEC_NAME: "${{ github.event.repository.name }}" - steps: - - uses: actions/checkout@v2 - with: - ref: 'rc' - - name: update submodule profiles - working-directory: ./resources/profiles - run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc - - name: update clock - run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk3 glew - run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev - - name: build deps & slicer - run: ./BuildLinux.sh -ds - - name: make .pot - working-directory: ./build - run: make gettext_make_pot - - name: build tar & appimage - working-directory: ./build - run: src/BuildLinuxImage.sh -i - - name: Upload artifact - uses: actions/upload-artifact@v1.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 - 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 index 93f509c8ed5..d583a8f1963 100644 --- a/.github/workflows/ccpp_ubuntu_rc.yml +++ b/.github/workflows/ccpp_ubuntu_rc.yml @@ -8,38 +8,48 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 + + env: + EXEC_NAME: "${{ github.event.repository.name }}" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'rc' + + - name: update apt cache & install packages + run: sudo apt update && sudo apt -y install git cmake libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext libssl-dev libcurl4-openssl-dev + - name: update submodule profiles working-directory: ./resources/profiles run: git submodule update --init - - name: change date in version - run: sed -i "s/+UNKNOWN//" version.inc + - name: update clock run: sudo hwclock -s - - name: update apt - run: sudo apt update - - name: install gtk2 glew - run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev + + - name: change date in version + run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + - name: build deps & slicer - run: ./BuildLinux.sh -dgs + run: ./BuildLinux.sh -ds + - name: make .pot working-directory: ./build run: make gettext_make_pot + - name: build tar & appimage working-directory: ./build run: src/BuildLinuxImage.sh -i + - name: Upload artifact - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: rc_linux_gtk2.tar + name: rc_linux.tar path: build/${{ github.event.repository.name }}.tar + - name: Upload appimage - uses: actions/upload-artifact@v1.0.0 + uses: actions/upload-artifact@v3 with: - name: rc-${{ github.event.repository.name }}-gtk2.AppImage + name: rc-${{ github.event.repository.name }}.AppImage path: build/${{ github.event.repository.name }}_ubu64.AppImage diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 1bd841de42c..55435789f40 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -23,7 +23,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@v3 with: name: deps_win path: ./deps/build/destdir/ @@ -33,7 +33,7 @@ jobs: needs: build_dep steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 - name: update submodule profiles working-directory: ./resources/profiles @@ -44,7 +44,7 @@ jobs: - name: mkdir in deps directory run: mkdir deps/destdir - name: download deps - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: deps_win path: deps/destdir @@ -106,7 +106,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@v3 with: name: nightly_win64 path: build/package/ diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml index 73c10012627..c203bed0430 100644 --- a/.github/workflows/ccpp_win_debug.yml +++ b/.github/workflows/ccpp_win_debug.yml @@ -10,7 +10,7 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'debug_win' - uses: ilammy/msvc-dev-cmd@v1 @@ -22,7 +22,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@v3 with: name: deps_win path: ./deps/build/destdir/ @@ -32,7 +32,7 @@ jobs: needs: build_dep steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 - name: update submodule profiles working-directory: ./resources/profiles @@ -43,7 +43,7 @@ jobs: - name: mkdir in deps directory run: mkdir deps/destdir - name: download deps - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: deps_win path: deps/destdir @@ -103,7 +103,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@v3 with: name: nightly_win64_debug path: build/package/ diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml index 56a3968754f..12fe1b8c046 100644 --- a/.github/workflows/ccpp_win_rc.yml +++ b/.github/workflows/ccpp_win_rc.yml @@ -10,7 +10,7 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: 'rc' - uses: ilammy/msvc-dev-cmd@v1 @@ -22,7 +22,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@v3 with: name: deps_win path: ./deps/build/destdir/ @@ -32,7 +32,7 @@ jobs: needs: build_dep steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 - name: update submodule profiles working-directory: ./resources/profiles @@ -43,7 +43,7 @@ jobs: - name: mkdir in deps directory run: mkdir deps/destdir - name: download deps - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: deps_win path: deps/destdir @@ -107,7 +107,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@v3 with: name: rc_win64 path: build/package/