From 43f2a6fb80cac28442ae4c79008d92fc7dd256e5 Mon Sep 17 00:00:00 2001 From: Antony Rizzitelli Date: Thu, 19 Nov 2026 07:41:24 +0000 Subject: [PATCH] build(ci): roll out trunk CI via antelopejs-sync --- .github/workflows/ci.yml | 9 +++++++-- .github/workflows/next-sync.yml | 16 ---------------- .github/workflows/release.yml | 4 +++- .github/workflows/stale.yml | 16 ---------------- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 6 files changed, 22 insertions(+), 47 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 60d77dc..904a033 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: @@ -48,12 +49,16 @@ jobs: mysql -uroot -h127.0.0.1 mysql < timezone_2026f_posix_sql/timezone_posix.sql echo "MYSQL_TEST_URL=mysql://root@127.0.0.1:3306/mysql" >> "$GITHUB_ENV" fi + affected-tests: true permissions: contents: read + 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 ab0f762..4b88faa 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@antelopejs/interface-api": ">=0.3.3 <0.4.0", "@antelopejs/interface-database-decorators": ">=0.5.2 <0.6.0", "@antelopejs/postgres": ">=0.4.2 <0.5.0", - "@antelopejs/tooling-configs": ">=0.8.0 <0.9.0", + "@antelopejs/tooling-configs": ">=0.8.9 <0.9.0", "@testcontainers/mysql": "^12.2.1", "@types/chai": "^4.3.20", "@types/mocha": "^10.0.10", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cbbb771..b6f9acd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,8 +40,8 @@ importers: specifier: '>=0.4.2 <0.5.0' version: 0.4.2 '@antelopejs/tooling-configs': - specifier: '>=0.8.0 <0.9.0' - version: 0.8.0(knip@6.45.1)(oxfmt@0.77.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2006)) + specifier: '>=0.8.9 <0.9.0' + version: 0.8.9(knip@6.45.1)(oxfmt@0.77.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2006)) '@testcontainers/mysql': specifier: ^12.2.1 version: 12.2.1(bare-buffer@3.7.1) @@ -141,8 +141,8 @@ packages: resolution: {integrity: sha512-oOdHK6PbEoBr2evXgn4+USg6EvKl1N3ggFhTKHWN8uti6smeYHH41WBEUlM2eMDSFZUh9+zuGafAkrzCs5o6bw==} engines: {node: '>=22'} - '@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: @@ -150,8 +150,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' @@ -926,8 +926,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': @@ -3001,9 +3001,9 @@ snapshots: transitivePeerDependencies: - pg-native - '@antelopejs/tooling-configs@0.8.0(knip@6.45.1)(oxfmt@0.77.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2006))': + '@antelopejs/tooling-configs@0.8.9(knip@6.45.1)(oxfmt@0.77.0)(oxlint@1.81.0(oxlint-tsgolint@7.0.2006))': 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 @@ -3560,7 +3560,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': {}