diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index b954c8062c..e42b1a7250 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -19,7 +19,7 @@ jobs: fail-fast: true matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 - os: windows-2019 - os: macos-12 arch: x86_64 @@ -63,7 +63,7 @@ jobs: ./build_release_macos.sh -d -a arm64 - name: Build on Ubuntu - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-22.04' working-directory: ${{ github.workspace }} run: | sudo apt-get update @@ -71,7 +71,7 @@ jobs: libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \ libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-4.0-dev \ libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-bad libosmesa6-dev wget sudo + gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev mkdir -p ${{ github.workspace }}/deps/build mkdir -p ${{ github.workspace }}/deps/build/destdir sudo ./BuildLinux.sh -ur diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index f6ba96a85b..6bda2ce959 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -62,11 +62,11 @@ jobs: run: | mkdir -p ${{ github.workspace }}/deps/build mkdir -p ${{ github.workspace }}/deps/build/destdir - curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz - tar -zxf OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz -C ${{ github.workspace }}/deps/build + curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz + tar -zxf OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz -C ${{ github.workspace }}/deps/build chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir ls -l ${{ github.workspace }}/deps/build/destdir - rm OrcaSlicer_dep_ubuntu_05-04-2023.tar.gz + rm OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz - name: Build Studio