diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index f2c7a2c135683..7e96518b590ea 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -11,9 +11,6 @@ on: systems: required: true type: string - defaultVersion: - required: true - type: string testVersions: required: false default: false @@ -108,7 +105,7 @@ jobs: - name: Evaluate the ${{ matrix.system }} output paths at the merge commit env: MATRIX_SYSTEM: ${{ matrix.system }} - MATRIX_VERSION: ${{ matrix.version || inputs.defaultVersion }} + MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }} run: | nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ @@ -122,14 +119,12 @@ jobs: if: inputs.targetSha env: MATRIX_SYSTEM: ${{ matrix.system }} - # This must match the default version set in the Merge Queue. - VERSION: lixPackageSets.latest.lix # This is very quick, because it pulls the eval results from Cachix. run: | nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ --arg chunkSize 8000 \ - --argstr nixPath "$VERSION" \ + --argstr nixPath "nixVersions.latest" \ --out-link target - name: Compare outpaths against the target branch @@ -289,10 +284,6 @@ jobs: diff.removed, diff.changed, diff.rebuilds - ).filter(attr => - // Exceptions related to dev shells, which changed at some time between 2.18 and 2.24. - !attr.startsWith('tests.devShellTools.nixos.') && - !attr.startsWith('tests.devShellTools.unstructuredDerivationInputEnv.') ) if (attrs.length > 0) { core.setFailed( diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 6298aaa4424d4..6ae96f0900f79 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -55,8 +55,6 @@ jobs: with: mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} systems: ${{ needs.prepare.outputs.systems }} - # This must match the version in Eval's target step. - defaultVersion: lixPackageSets.latest.lix # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block the Merge Queue. diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a9d40fcdcf5dc..9f4a2ba4d0b46 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -86,7 +86,6 @@ jobs: mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} systems: ${{ needs.prepare.outputs.systems }} - defaultVersion: nixVersions.latest testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }} labels: