diff --git a/.github/workflows/build-i686-linux.yml b/.github/workflows/build-i686-linux.yml deleted file mode 100644 index 6a987770..00000000 --- a/.github/workflows/build-i686-linux.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Build i686 Linux (static) - -on: - workflow_call: - inputs: - cache-key: - type: string - required: false - default: i686-linux-artifacts-${{ github.sha }} - -jobs: - build-i686-linux: - name: Build i686 Linux (static) - runs-on: UbuntuLatest32Cores128G - concurrency: ${{ inputs.cache-key }} - permissions: - id-token: "write" - contents: "read" - steps: - - uses: actions/checkout@v3 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@main - with: - flakehub: true - - uses: DeterminateSystems/magic-nix-cache-action@main - with: - use-gha-cache: false - - name: Build the installer - run: | - nix build .#packages.i686-linux.nix-installer-static -L - cp result/bin/nix-installer . - - name: Create GitHub cache from build artifacts - uses: actions/cache/save@v3 - with: - path: nix-installer - key: ${{ inputs.cache-key }} diff --git a/.github/workflows/release-branches.yml b/.github/workflows/release-branches.yml index d6ecb24a..e0f90463 100644 --- a/.github/workflows/release-branches.yml +++ b/.github/workflows/release-branches.yml @@ -19,10 +19,6 @@ jobs: uses: ./.github/workflows/build-x86_64-linux.yml with: cache-key: release-x86_64-linux-artifacts-${{ github.sha }} - build-i686-linux: - uses: ./.github/workflows/build-i686-linux.yml - with: - cache-key: release-i686-linux-artifacts-${{ github.sha }} build-aarch64-linux: uses: ./.github/workflows/build-aarch64-linux.yml with: @@ -42,7 +38,6 @@ jobs: id-token: write # In order to request a JWT for AWS auth needs: - build-x86_64-linux - - build-i686-linux - build-aarch64-linux - build-x86_64-darwin - build-aarch64-darwin @@ -60,14 +55,6 @@ jobs: - name: Move artifact to artifacts directory run: mv ./nix-installer ./artifacts/nix-installer-x86_64-linux - - name: Fetch cached i686-linux binary - uses: actions/cache/restore@v3 - with: - path: nix-installer - key: release-i686-linux-artifacts-${{ github.sha }} - - name: Move artifact to artifacts directory - run: mv ./nix-installer ./artifacts/nix-installer-i686-linux - - name: Fetch cached aarch64-linux binary uses: actions/cache/restore@v3 with: diff --git a/.github/workflows/release-prs.yml b/.github/workflows/release-prs.yml index 895a06a0..af26ed25 100644 --- a/.github/workflows/release-prs.yml +++ b/.github/workflows/release-prs.yml @@ -29,19 +29,6 @@ jobs: uses: ./.github/workflows/build-x86_64-linux.yml with: cache-key: release-x86_64-linux-artifacts-${{ github.sha }} - build-i686-linux: - # Only intra-repo PRs are allowed to have PR artifacts uploaded - # We only want to trigger once the upload once in the case the upload label is added, not when any label is added - if: | - always() && !failure() && !cancelled() - && github.event.pull_request.head.repo.full_name == 'DeterminateSystems/nix-installer' - && ( - (github.event.action == 'labeled' && github.event.label.name == 'upload to s3') - || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'upload to s3')) - ) - uses: ./.github/workflows/build-i686-linux.yml - with: - cache-key: release-i686-linux-artifacts-${{ github.sha }} build-aarch64-linux: # Only intra-repo PRs are allowed to have PR artifacts uploaded # We only want to trigger once the upload once in the case the upload label is added, not when any label is added @@ -95,7 +82,6 @@ jobs: runs-on: ubuntu-latest needs: - build-x86_64-linux - - build-i686-linux - build-aarch64-linux - build-x86_64-darwin - build-aarch64-darwin @@ -113,14 +99,6 @@ jobs: - name: Move artifact to artifacts directory run: mv ./nix-installer ./artifacts/nix-installer-x86_64-linux - - name: Fetch cached i686-linux binary - uses: actions/cache/restore@v3 - with: - path: nix-installer - key: release-i686-linux-artifacts-${{ github.sha }} - - name: Move artifact to artifacts directory - run: mv ./nix-installer ./artifacts/nix-installer-i686-linux - - name: Fetch cached aarch64-linux binary uses: actions/cache/restore@v3 with: diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index f4255051..61404667 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -17,10 +17,6 @@ jobs: uses: ./.github/workflows/build-x86_64-linux.yml with: cache-key: release-x86_64-linux-artifacts-${{ github.sha }} - build-i686-linux: - uses: ./.github/workflows/build-i686-linux.yml - with: - cache-key: release-i686-linux-artifacts-${{ github.sha }} build-aarch64-linux: uses: ./.github/workflows/build-aarch64-linux.yml with: @@ -38,7 +34,6 @@ jobs: runs-on: ubuntu-latest needs: - build-x86_64-linux - - build-i686-linux - build-aarch64-linux - build-x86_64-darwin - build-aarch64-darwin @@ -56,14 +51,6 @@ jobs: - name: Move artifact to artifacts directory run: mv ./nix-installer ./artifacts/nix-installer-x86_64-linux - - name: Fetch cached i686-linux binary - uses: actions/cache/restore@v3 - with: - path: nix-installer - key: release-i686-linux-artifacts-${{ github.sha }} - - name: Move artifact to artifacts directory - run: mv ./nix-installer ./artifacts/nix-installer-i686-linux - - name: Fetch cached aarch64-linux binary uses: actions/cache/restore@v3 with: diff --git a/src/action/common/configure_init_service.rs b/src/action/common/configure_init_service.rs index f0f1479e..ec66e24a 100644 --- a/src/action/common/configure_init_service.rs +++ b/src/action/common/configure_init_service.rs @@ -459,26 +459,24 @@ impl Action for ConfigureInitService { } for SocketFile { name, src, .. } in socket_files.iter() { - if *start_daemon || any_socket_was_active { - match src { - UnitSrc::Path(path) => { - // NOTE(cole-h): we have to enable by path here because older - // systemd's (e.g. on our Ubuntu 16.04 test VMs) had faulty (or too- - // strict) symlink detection, which causes the symlink chain of - // `/etc/systemd/system/nix-daemon.socket` -> - // `/nix/var/nix/profiles/default` -> `/nix/store/............/nix- - // daemon.socket` to fail with "Failed to execute operation: Too - // many levels of symbolic links" - enable(path.display().to_string().as_ref(), true) - .await - .map_err(Self::error)?; - }, - UnitSrc::Literal(_) => { - enable(name, true).await.map_err(Self::error)?; - }, - } - } else { - enable(name, false).await.map_err(Self::error)?; + let enable_now = *start_daemon || any_socket_was_active; + + match src { + UnitSrc::Path(path) => { + // NOTE(cole-h): we have to enable by path here because older systemd's + // (e.g. on our Ubuntu 16.04 test VMs) had faulty (or too- strict) + // symlink detection, which causes the symlink chain of + // `/etc/systemd/system/nix-daemon.socket` -> + // `/nix/var/nix/profiles/default` -> `/nix/store/............/nix- + // daemon.socket` to fail with "Failed to execute operation: Too many + // levels of symbolic links" + enable(path.display().to_string().as_ref(), enable_now) + .await + .map_err(Self::error)?; + }, + UnitSrc::Literal(_) => { + enable(name, enable_now).await.map_err(Self::error)?; + }, } } },