diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index 6e1008787..a7de6f145 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -23,11 +23,10 @@ jobs: uses: calamares/actions/generic-checkout@v5 - name: "install dependencies" shell: bash - run: | - ./ci/deps-neon.sh + run: ./ci/deps-neon.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 + shell: bash + run: ./ci/build.sh - name: "Calamares: archive" working-directory: ${{ env.BUILDDIR }} run: | diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index f71a2ba53..ef743ec56 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -19,7 +19,7 @@ jobs: image: docker://opensuse/tumbleweed options: --tmpfs /build:rw --user 0:0 steps: - - name: "prepare env" + - name: "prepare git" shell: bash run: zypper --non-interactive in git-core jq curl - name: "prepare source" diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh index 01ff84fe3..df6eb5dc6 100755 --- a/ci/deps-opensuse.sh +++ b/ci/deps-opensuse.sh @@ -6,37 +6,37 @@ zypper --non-interactive up zypper --non-interactive in git-core jq curl # From deploycala.py zypper --non-interactive in \ - "bison" \ - "flex" \ - "git" \ - "make" \ - "cmake" \ - "gcc-c++" + "bison" \ + "flex" \ + "git" \ + "make" \ + "cmake" \ + "gcc-c++" zypper --non-interactive in \ - "libqt5-qtbase-devel" \ - "libqt5-linguist-devel" \ - "libqt5-qtsvg-devel" \ - "libqt5-qtdeclarative-devel" \ - "libqt5-qtwebengine-devel" \ - "yaml-cpp-devel" \ - "libpolkit-qt5-1-devel" \ - "libpwquality-devel" \ - "parted-devel" \ - "python-devel" \ - "libboost_headers-devel" \ - "libboost_python3-devel" + "libqt5-qtbase-devel" \ + "libqt5-linguist-devel" \ + "libqt5-qtsvg-devel" \ + "libqt5-qtdeclarative-devel" \ + "libqt5-qtwebengine-devel" \ + "yaml-cpp-devel" \ + "libpolkit-qt5-1-devel" \ + "libpwquality-devel" \ + "parted-devel" \ + "python-devel" \ + "libboost_headers-devel" \ + "libboost_python3-devel" zypper --non-interactive in \ - "extra-cmake-modules" \ - "kdbusaddons-devel" \ - "kservice-devel" \ - "kpackage-devel" \ - "kparts-devel" \ - "kcrash-devel" \ - "kpmcore-devel" \ - "plasma5-workspace-devel" \ - "plasma-framework-devel" + "extra-cmake-modules" \ + "kdbusaddons-devel" \ + "kservice-devel" \ + "kpackage-devel" \ + "kparts-devel" \ + "kcrash-devel" \ + "kpmcore-devel" \ + "plasma5-workspace-devel" \ + "plasma-framework-devel" # Additional dependencies zypper --non-interactive in \ - libicu-devel \ - libAppStreamQt-devel \ - libatasmart-devel + libicu-devel \ + libAppStreamQt-devel \ + libatasmart-devel