1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00

refactor(libstore): withCurlS3 -> withAWS

Now that the legacy S3 implementation is gone, we can go back to calling
things `NIX_WITH_S3_SUPPORT`.
This commit is contained in:
Bernardo Meurer Costa 2025-10-14 23:58:48 +00:00
parent 9295c14a35
commit 1f710300c9
No known key found for this signature in database
19 changed files with 42 additions and 44 deletions

View file

@ -67,7 +67,7 @@ jobs:
instrumented: false
primary: true
stdenv: stdenv
withCurlS3: true
withAWS: true
# TODO: remove once curl-based-s3 fully lands
- scenario: on ubuntu (no s3)
runs-on: ubuntu-24.04
@ -75,21 +75,21 @@ jobs:
instrumented: false
primary: false
stdenv: stdenv
withCurlS3: false
withAWS: false
- scenario: on macos
runs-on: macos-14
os: darwin
instrumented: false
primary: true
stdenv: stdenv
withCurlS3: true
withAWS: true
- scenario: on ubuntu (with sanitizers / coverage)
runs-on: ubuntu-24.04
os: linux
instrumented: true
primary: false
stdenv: clangStdenv
withCurlS3: true
withAWS: true
name: tests ${{ matrix.scenario }}
runs-on: ${{ matrix.runs-on }}
timeout-minutes: 60
@ -113,13 +113,13 @@ jobs:
nix build --file ci/gha/tests/wrapper.nix componentTests -L \
--arg withInstrumentation ${{ matrix.instrumented }} \
--argstr stdenv "${{ matrix.stdenv }}" \
${{ format('--arg withCurlS3 {0}', matrix.withCurlS3) }}
${{ format('--arg withAWS {0}', matrix.withAWS) }}
- name: Run VM tests
run: |
nix build --file ci/gha/tests/wrapper.nix vmTests -L \
--arg withInstrumentation ${{ matrix.instrumented }} \
--argstr stdenv "${{ matrix.stdenv }}" \
${{ format('--arg withCurlS3 {0}', matrix.withCurlS3) }}
${{ format('--arg withAWS {0}', matrix.withAWS) }}
if: ${{ matrix.os == 'linux' }}
- name: Run flake checks and prepare the installer tarball
run: |
@ -131,7 +131,7 @@ jobs:
nix build --file ci/gha/tests/wrapper.nix codeCoverage.coverageReports -L \
--arg withInstrumentation ${{ matrix.instrumented }} \
--argstr stdenv "${{ matrix.stdenv }}" \
${{ format('--arg withCurlS3 {0}', matrix.withCurlS3) }} \
${{ format('--arg withAWS {0}', matrix.withAWS) }} \
--out-link coverage-reports
cat coverage-reports/index.txt >> $GITHUB_STEP_SUMMARY
if: ${{ matrix.instrumented }}