From 932fb8f6f1827537b62d9d78c8484dabbf59ec7c Mon Sep 17 00:00:00 2001 From: Antony Rizzitelli Date: Thu, 19 Nov 2026 07:41:11 +0000 Subject: [PATCH] build(ci): roll out trunk CI with merge queue --- .github/workflows/ci.yml | 10 ++++- .github/workflows/next-sync.yml | 16 -------- .github/workflows/release.yml | 4 +- .github/workflows/stale.yml | 16 -------- package.json | 2 +- pnpm-lock.yaml | 72 +++++++++++++++++++++------------ 6 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 .github/workflows/next-sync.yml delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86b7ff8..9a2bcb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,10 @@ name: CI on: pull_request: - types: [opened, synchronize, reopened, ready_for_review] + types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] + merge_group: push: - branches: [next] + branches: [main] schedule: - cron: "17 2 * * *" workflow_dispatch: @@ -30,10 +31,15 @@ jobs: node .agents/skills/formal-add-sub-contract/check.mjs node .agents/skills/formal-group-mapper/check.mjs test-job: true + single-job: false + affected-tests: true + secrets: + NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }} renovate-sync: if: >- github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/') && github.event.pull_request.head.repo.full_name == github.repository permissions: contents: write actions: write + statuses: write uses: AntelopeJS/.github/.github/workflows/ci-renovate-sync.yml@v2 diff --git a/.github/workflows/next-sync.yml b/.github/workflows/next-sync.yml deleted file mode 100644 index 2a1228b..0000000 --- a/.github/workflows/next-sync.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Next sync - -on: - push: - branches: [main] - -permissions: {} - -jobs: - next-sync: - permissions: - issues: write - uses: AntelopeJS/.github/.github/workflows/next-sync.yml@v2 - secrets: - RELEASE_GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }} - NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85dc9fa..0b6f68a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,9 @@ name: Release on: push: - branches: [next] + branches: [main] + pull_request: + types: [labeled, synchronize, reopened] workflow_dispatch: inputs: release-version: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 5faf7ec..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Close stale issues - -on: - schedule: - - cron: "30 4 * * *" - workflow_dispatch: - -permissions: {} - -jobs: - stale: - permissions: - actions: write - issues: write - pull-requests: write - uses: AntelopeJS/.github/.github/workflows/stale.yml@v2 diff --git a/package.json b/package.json index 6032512..5d0792c 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ }, "devDependencies": { "@antelopejs/core": "~1.23.1", - "@antelopejs/tooling-configs": ">=0.8.0 <0.9.0", + "@antelopejs/tooling-configs": "^0.8.9", "@types/chai": "^4.3.20", "@types/mocha": "^10.0.10", "@types/node": "^22.19.15", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9433efc..ec09ab6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,8 +40,8 @@ importers: specifier: ~1.23.1 version: 1.23.1 '@antelopejs/tooling-configs': - specifier: '>=0.8.0 <0.9.0' - version: 0.8.0(eslint-plugin-perfectionist@5.11.0(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(knip@6.34.0)(oxfmt@0.66.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2001)) + specifier: ^0.8.9 + version: 0.8.9(eslint-plugin-perfectionist@5.11.0(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(knip@6.34.0)(oxfmt@0.66.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2001)) '@types/chai': specifier: ^4.3.20 version: 4.3.20 @@ -127,8 +127,8 @@ packages: '@antelopejs/interface-mongodb@0.0.7': resolution: {integrity: sha512-uWcKbrxKv6p6pWC8jwJALhI4q31hVAeyI4mKKKUsN2imgruwQay8+JZbl5ptlNfzJyH22QiQ0P9dcJfeThnKyg==} - '@antelopejs/tooling-configs@0.8.0': - resolution: {integrity: sha512-o2sec/CFUH//QtXUjGpbeFp0D/QI0H5+59nDoihgz4biEE2D5Z+o1r69yY9c7cRyOY1nnFxiHluuhKoylasc1g==} + '@antelopejs/tooling-configs@0.8.9': + resolution: {integrity: sha512-DMar3gDUBy73qpAqv8coGCmvIBrZ12FtyYwD+Igqn6jrb92GMxZAuI2YlW9pED9tS3tdk17+aZRIyVO0oDacHA==} engines: {node: '>=22.18.0'} hasBin: true peerDependencies: @@ -136,8 +136,8 @@ packages: eslint-plugin-perfectionist: '>=5.0.0' knip: '>=6.0.0' mongodb-memory-server: '>=10.0.0' - oxfmt: ^0.66.0 || ^0.77.0 - oxlint: 1.81.0 + oxfmt: ^0.66.0 || ^0.77.0 || ^0.79.0 + oxlint: 1.81.0 || 1.94.0 pixelmatch: '>=7.0.0' playwright-core: '>=1.56.0' sharp: '>=0.34.0' @@ -190,12 +190,12 @@ packages: peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - '@eslint-community/regexpp@4.12.2': - resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} + '@eslint-community/regexpp@4.12.3': + resolution: {integrity: sha512-R76UKbvsqI68DJJVTVyqFKqU98CN4+B+acxNfEA2IFarSzP0SjtKf/3+fFiXzTyv5Fj3PxLkGHe2wnVWWMxobQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/config-array@0.23.5': - resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==} + '@eslint/config-array@0.23.6': + resolution: {integrity: sha512-WrTH7nioI9QPY4NZGnsywmecswJdgeq4BCM76qok9VgjTO29ZgUzUvcuJLVPYVQM4uDbaPBU0M33R9DIxI8X3w==} engines: {node: ^20.19.0 || ^22.13.0 || >=24} '@eslint/config-helpers@0.7.0': @@ -372,6 +372,9 @@ packages: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} + '@isaacs/nonrecursive-glob-match@1.1.0': + resolution: {integrity: sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==} + '@keyv/bigmap@1.3.1': resolution: {integrity: sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==} engines: {node: '>= 18'} @@ -948,8 +951,8 @@ packages: cpu: [x64] os: [win32] - '@oxlint/plugins@1.81.0': - resolution: {integrity: sha512-HhD8kd3r6XpelZkhxhRty/po8V6yK1VV63Eq4kSsOS2IoHUywG3DV2EX+z/ZHw46aLI74Y6aA604NRiAqLKW9w==} + '@oxlint/plugins@1.94.0': + resolution: {integrity: sha512-YT6htikBOBQ00XDxZpRZLZ0anEDo7h9s4+YvjRU0/Ng/cLd0D6SZQ3tsms4g/GDer/z8UKlegC5iptEfyRXJcw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} '@phun-ky/typeof@2.0.3': @@ -981,8 +984,8 @@ packages: '@types/esrecurse@4.3.1': resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==} - '@types/estree@1.0.9': - resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} + '@types/estree@1.0.10': + resolution: {integrity: sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==} '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} @@ -1320,6 +1323,10 @@ packages: resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==} engines: {node: 20 || >=22} + brace-expansion@5.0.13: + resolution: {integrity: sha512-Vh3dmFbc4wZeox7M9I/0L9GfFd83Su4+yCck/OF9Gi/P/dAHn0RT7X4K9R7gMNMhDck3DvhR6QXsnQdjjgwNvQ==} + engines: {node: 20 || >=22} + brace-expansion@5.0.5: resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==} engines: {node: 18 || 20 || >=22} @@ -2148,6 +2155,10 @@ packages: resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} engines: {node: 18 || 20 || >=22} + minimatch@11.0.9: + resolution: {integrity: sha512-KCFkfyjqerNlSstjlhIGNXIKZGA/6O4V4RlhZ+Dsr621SPPw0mzlypE9D9ZOoPiVefHID+j7/XuMMlqfD/F60Q==} + engines: {node: 20 || >=22} + minimatch@3.1.5: resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} @@ -2994,9 +3005,9 @@ snapshots: - socks optional: true - '@antelopejs/tooling-configs@0.8.0(eslint-plugin-perfectionist@5.11.0(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(knip@6.34.0)(oxfmt@0.66.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2001))': + '@antelopejs/tooling-configs@0.8.9(eslint-plugin-perfectionist@5.11.0(eslint@10.10.0(jiti@2.7.0))(typescript@5.9.3))(knip@6.34.0)(oxfmt@0.66.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2001))': dependencies: - '@oxlint/plugins': 1.81.0 + '@oxlint/plugins': 1.94.0 dts-bundle-generator: 9.5.1 minimatch: 10.2.6 semver: 7.8.6 @@ -3073,13 +3084,13 @@ snapshots: eslint: 10.10.0(jiti@2.7.0) eslint-visitor-keys: 3.4.3 - '@eslint-community/regexpp@4.12.2': {} + '@eslint-community/regexpp@4.12.3': {} - '@eslint/config-array@0.23.5': + '@eslint/config-array@0.23.6': dependencies: '@eslint/object-schema': 3.0.5 debug: 4.4.3(supports-color@8.1.1) - minimatch: 10.2.6 + minimatch: 11.0.9 transitivePeerDependencies: - supports-color @@ -3248,6 +3259,8 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 + '@isaacs/nonrecursive-glob-match@1.1.0': {} + '@keyv/bigmap@1.3.1(keyv@5.6.0)': dependencies: hashery: 1.5.1 @@ -3586,7 +3599,7 @@ snapshots: '@oxlint/binding-win32-x64-msvc@1.81.0': optional: true - '@oxlint/plugins@1.81.0': {} + '@oxlint/plugins@1.94.0': {} '@phun-ky/typeof@2.0.3': {} @@ -3617,7 +3630,7 @@ snapshots: '@types/esrecurse@4.3.1': {} - '@types/estree@1.0.9': {} + '@types/estree@1.0.10': {} '@types/json-schema@7.0.15': {} @@ -3885,6 +3898,10 @@ snapshots: dependencies: balanced-match: 4.0.4 + brace-expansion@5.0.13: + dependencies: + balanced-match: 4.0.4 + brace-expansion@5.0.5: dependencies: balanced-match: 4.0.4 @@ -4164,7 +4181,7 @@ snapshots: eslint-scope@9.1.2: dependencies: '@types/esrecurse': 4.3.1 - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 esrecurse: 4.3.0 estraverse: 5.3.0 @@ -4175,15 +4192,15 @@ snapshots: eslint@10.10.0(jiti@2.7.0): dependencies: '@eslint-community/eslint-utils': 4.10.1(eslint@10.10.0(jiti@2.7.0)) - '@eslint-community/regexpp': 4.12.2 - '@eslint/config-array': 0.23.5 + '@eslint-community/regexpp': 4.12.3 + '@eslint/config-array': 0.23.6 '@eslint/config-helpers': 0.7.0 '@eslint/core': 1.2.1 '@eslint/plugin-kit': 0.7.3 '@humanfs/node': 0.16.8 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 - '@types/estree': 1.0.9 + '@types/estree': 1.0.10 ajv: 6.15.0 cross-spawn: 7.0.6 debug: 4.4.3(supports-color@8.1.1) @@ -4734,6 +4751,11 @@ snapshots: dependencies: brace-expansion: 5.0.12 + minimatch@11.0.9: + dependencies: + '@isaacs/nonrecursive-glob-match': 1.1.0 + brace-expansion: 5.0.13 + minimatch@3.1.5: dependencies: brace-expansion: 1.1.21