From 7ce21aceb625452fd553b5e366a136d3bf748052 Mon Sep 17 00:00:00 2001 From: forbes-0023 Date: Tue, 3 Feb 2026 10:59:26 -0600 Subject: [PATCH] fix(ci): remove container directive for dockerized runner compatibility Gitea act_runner in Docker mode maps the runs-on label to a container image via its config. The container: block conflicts with this by attempting to create a nested container. Remove it so the runner's own docker://ubuntu:24.04 mapping is used directly. --- .gitea/workflows/build.yml | 5 +---- .gitea/workflows/release.yml | 19 ++----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 68db911130..d90d9f4cd6 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -11,9 +11,6 @@ on: jobs: build: runs-on: ubuntu-latest - container: - image: ubuntu:24.04 - options: --security-opt seccomp=unconfined env: CCACHE_DIR: /tmp/ccache-kindred-create @@ -29,7 +26,7 @@ jobs: run: | apt-get update -qq apt-get install -y --no-install-recommends \ - ca-certificates curl git xvfb xauth openssl \ + ca-certificates curl git xvfb xauth openssl sudo \ libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxkbcommon-dev \ libxcb-xkb-dev libfontconfig1-dev diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index e87043f6df..c5c43f76d0 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -17,9 +17,6 @@ jobs: # --------------------------------------------------------------------------- build-linux: runs-on: ubuntu-latest - container: - image: ubuntu:24.04 - options: --security-opt seccomp=unconfined env: CCACHE_DIR: /tmp/ccache-kindred-create @@ -38,7 +35,7 @@ jobs: run: | apt-get update -qq apt-get install -y --no-install-recommends \ - ca-certificates curl git file fuse3 xvfb xauth openssl dpkg-dev \ + ca-certificates curl git file fuse3 xvfb xauth openssl sudo dpkg-dev \ libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxkbcommon-dev \ libxcb-xkb-dev libfontconfig1-dev @@ -117,14 +114,13 @@ jobs: # --------------------------------------------------------------------------- build-macos: strategy: + fail-fast: false matrix: include: - runner: macos-13 arch: x86_64 - preset: conda-macos-release - runner: macos-14 arch: arm64 - preset: conda-macos-release runs-on: ${{ matrix.runner }} @@ -248,17 +244,6 @@ jobs: pixi install pixi run -e package create_bundle - - name: Build NSIS installer - shell: bash - working-directory: package/rattler-build/windows - run: | - if [ "${MAKE_INSTALLER}" == "true" ]; then - # The create_bundle.sh script builds the 7z archive. - # NSIS installer is built as part of the bundle script when - # MAKE_INSTALLER is set and NSIS is available. - echo "Installer build completed as part of create_bundle" - fi - - name: Save ccache if: always() uses: https://github.com/actions/cache/save@v4