diff --git a/.github/actions/checks-lane/action.yml b/.github/actions/checks-lane/action.yml deleted file mode 100644 index 038bc2c52..000000000 --- a/.github/actions/checks-lane/action.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: api-extractor-effect checks lane -description: this repository's steps for each phase of systemfsoftware's reusable-checks.yml -inputs: - lane: - description: plan, lint, typecheck, build, test, test-after, timings or gate - required: true - job: - description: The test job from the plan, as JSON - required: false - default: "{}" - profile: - description: Conformance profile; this repository has none, so it is ignored - required: false - default: per-change -runs: - using: composite - steps: - - uses: cachix/install-nix-action@13d8dd58da0234aa297dedd986986ccb8e7f3e24 # v31.11.1 - if: inputs.lane == 'plan' || inputs.lane == 'timings' || inputs.lane == 'build' || inputs.lane == 'lint' || inputs.lane == 'typecheck' || inputs.lane == 'test' - with: - extra_nix_config: | - extra-substituters = https://nix.systemfsoftware.com - extra-trusted-public-keys = nix-cache-1:wXA8I4DayNW9q6enUyQA/P/nT38pGSTLt374t3gsn7M= - - name: The test-timings planner from the flake - if: inputs.lane == 'plan' || inputs.lane == 'timings' - shell: bash -e {0} - run: echo "$(nix build --no-link --print-out-paths .#test-timings)/bin" >> "$GITHUB_PATH" - - name: attw from the flake - if: inputs.lane == 'build' - shell: bash -e {0} - run: echo "$(nix build --no-link --print-out-paths .#attw)/bin" >> "$GITHUB_PATH" - - - uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0 - if: inputs.lane == 'plan' || inputs.lane == 'lint' || inputs.lane == 'typecheck' || inputs.lane == 'build' || inputs.lane == 'test' - - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 - if: inputs.lane == 'plan' || inputs.lane == 'lint' || inputs.lane == 'typecheck' || inputs.lane == 'build' || inputs.lane == 'test' - with: - node-version: 24 - - name: Install from the lockfile; the dev shell copies in the producer tarballs - if: inputs.lane == 'lint' || inputs.lane == 'typecheck' || inputs.lane == 'build' || inputs.lane == 'test' - shell: bash -e {0} - run: nix develop --command pnpm install --frozen-lockfile diff --git a/.github/workflows/changeset-check.yml b/.github/workflows/changeset-check.yml deleted file mode 100644 index ab7054ddb..000000000 --- a/.github/workflows/changeset-check.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Changeset Check - -on: - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - -permissions: - contents: read - pull-requests: read - -jobs: - check: - uses: systemfsoftware/pnpm-release-management/.github/workflows/changeset-check.yml@741c8c4334c261058dd4a3b2976c9f2e3796d523 - with: - # The lockfile installs `file:.deps` tarballs, which the dev shell copies in - # from this repository's flake. - devshell: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd69b7f50..b0dd5edd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,21 +15,19 @@ concurrency: cancel-in-progress: true jobs: - # Lint, typecheck, build with attw, and the test jobs the planner packs from - # recorded timings. Each phase runs .github/actions/checks-lane. + # A pull request runs the affected lint, typecheck and build, then attw; a Mergify queue draft and main run the + # whole workspace and its tests. One job, so the runner and Nix setup are paid once. checks: - permissions: - contents: read - actions: read - uses: systemfsoftware/systemfsoftware/.github/workflows/reusable-checks.yml@b146694efe1139948c03bd9e9e366c725252c0d1 + uses: systemfsoftware/systemfsoftware/.github/workflows/reusable-ci.yml@6c79f6181556f62358795912ed5f905da8fffd47 with: - lanes: '[{"id": "lint", "name": "lint", "timeout-minutes": 10, "run": "pnpm lint"}, {"id": "typecheck", "name": "typecheck", "timeout-minutes": 10, "run": "pnpm typecheck"}, {"id": "build", "name": "build ยท attw", "timeout-minutes": 10, "run": "pnpm build && pnpm --filter @systemfsoftware/api-extractor attw"}]' - timeout-minutes: 10 - max-seconds: 600 - plan-timeout-minutes: 10 + commitlint: false + changeset: true + fast: export TURBO_SCM_BASE="$BASE" TURBO_SCM_HEAD="$HEAD" && pnpm exec turbo run lint typecheck build --affected && PATH="$(nix build --no-link --print-out-paths .#attw)/bin:$PATH" pnpm --filter @systemfsoftware/api-extractor attw + full: pnpm lint && pnpm typecheck && pnpm build && PATH="$(nix build --no-link --print-out-paths .#attw)/bin:$PATH" pnpm --filter @systemfsoftware/api-extractor attw && pnpm test host-bytes: name: Output bytes on ${{ matrix.arch }} + if: github.event_name == 'push' strategy: matrix: include: @@ -59,6 +57,7 @@ jobs: host-compare: name: Same bytes on every host + if: github.event_name == 'push' needs: host-bytes runs-on: ubuntu-latest timeout-minutes: 5 diff --git a/.mergify.yml b/.mergify.yml index 396d37a01..b2eca74d6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -19,15 +19,10 @@ queue_rules: - dependabot-update-type = version-update:semver-patch - dependabot-update-type = version-update:semver-minor - "title ~= (?i)\\bthe [a-z0-9@/._-]*(minor|patch)[a-z0-9@/._-]* group\\b" - - check-success = checks / the gate - - or: - - check-success = check / a publishable-package change needs an intent - - check-skipped = check / a publishable-package change needs an intent - - check-success = Same bytes on every host + - check-success = checks / check # Checked on Mergify's queue draft PR (mergify/merge-queue/*), i.e. CI on the PR rebased with main and any batch. merge_conditions: - - check-success = checks / the gate - - check-success = Same bytes on every host + - check-success = checks / check - name: default # Checked on the PR itself before it enters the queue. @@ -51,12 +46,7 @@ queue_rules: - dependabot-update-type = version-update:semver-patch - dependabot-update-type = version-update:semver-minor - "title ~= (?i)\\bthe [a-z0-9@/._-]*(minor|patch)[a-z0-9@/._-]* group\\b" - - check-success = checks / the gate - - or: - - check-success = check / a publishable-package change needs an intent - - check-skipped = check / a publishable-package change needs an intent - - check-success = Same bytes on every host + - check-success = checks / check # Checked on Mergify's queue draft PR (mergify/merge-queue/*), i.e. CI on the PR rebased with main and any batch. merge_conditions: - - check-success = checks / the gate - - check-success = Same bytes on every host + - check-success = checks / check