From 6eaab5e226a52e3aa7ec2c1b312d3f9c58c4b6f8 Mon Sep 17 00:00:00 2001 From: Raoul Rubien Date: Sat, 1 Feb 2025 13:32:44 +0100 Subject: [PATCH] fixes scrpt name that `ack` did not find on the first pass: {.github/workflows,src/platform/unix}/build_* --- .github/workflows/build_all.yml | 2 +- .github/workflows/build_deps.yml | 4 ++-- .github/workflows/build_orca.yml | 6 +++--- src/platform/unix/build_linux_image.sh.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 5da2b6979f9..a5a3cf94a1b 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -24,7 +24,7 @@ on: - '**/CMakeLists.txt' - 'version.inc' - ".github/workflows/build_*.yml" - - 'BuildLinux.sh' + - 'build_linux.sh' - 'build_release_vs2022.bat' - 'build_release_macos.sh' diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 163cbca23c0..b453dbbff2f 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -103,9 +103,9 @@ jobs: run: | mkdir -p ${{ github.workspace }}/deps/build mkdir -p ${{ github.workspace }}/deps/build/destdir - sudo ./BuildLinux.sh -ur + sudo ./build_linux.sh -ur sudo chown $USER -R ./ - ./BuildLinux.sh -dr + ./build_linux.sh -dr cd deps/build tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index e417b3ef36c..bde164240d9 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -247,10 +247,10 @@ jobs: libgtk-3-dev libgtk-3-dev libmspack-dev libosmesa6-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \ libwebkit2gtk-${{ env.webkit-ver }}-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget ${{ env.libfuse2-pkg }} - - name: Install dependencies from BuildLinux.sh + - name: Install dependencies from build_linux.sh if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' shell: bash - run: sudo ./BuildLinux.sh -ur + run: sudo ./build_linux.sh -ur - name: Fix permissions if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' @@ -263,7 +263,7 @@ jobs: env: ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }} run: | - ./BuildLinux.sh -isr + ./build_linux.sh -isr mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage diff --git a/src/platform/unix/build_linux_image.sh.in b/src/platform/unix/build_linux_image.sh.in index e97842742de..a6d61ab3d7f 100755 --- a/src/platform/unix/build_linux_image.sh.in +++ b/src/platform/unix/build_linux_image.sh.in @@ -8,7 +8,7 @@ while getopts ":ih" opt; do i ) export BUILD_IMAGE="1" ;; - h ) echo "Usage: ./BuildLinuxImage.sh [-i]" + h ) echo "Usage: ./build_linux_image.sh [-i]" echo " -i: Generate Appimage (optional)" exit 0 ;;