From 78cde9946902603e9affeeeb45539a9ae89353ca Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Mon, 10 Mar 2025 21:09:20 +0100 Subject: [PATCH] chore: Small improvements to CI pipelines (#26690) --- .github/workflows/ci.yml | 11 +++++------ .github/workflows/codeql.yaml | 2 +- ...{deps_review.yaml => dependency-review.yaml} | 3 ++- ...pr_to_master.yaml => fail-pr-to-master.yaml} | 2 +- .../{ghcr_cleanup.yml => ghcr-cleanup.yml} | 2 +- ...aster_to_dev.yml => merge-master-to-dev.yml} | 4 ++-- .../{release_please.yml => release-please.yml} | 2 +- .github/workflows/stale.yml | 2 +- ...{update_deps.yml => update-dependencies.yml} | 17 +++++++++++------ .../{update_dep.yml => update-dependency.yml} | 4 ++-- package.json | 1 + 11 files changed, 28 insertions(+), 22 deletions(-) rename .github/workflows/{deps_review.yaml => dependency-review.yaml} (92%) rename .github/workflows/{fail_pr_to_master.yaml => fail-pr-to-master.yaml} (95%) rename .github/workflows/{ghcr_cleanup.yml => ghcr-cleanup.yml} (98%) rename .github/workflows/{merge_master_to_dev.yml => merge-master-to-dev.yml} (89%) rename .github/workflows/{release_please.yml => release-please.yml} (99%) rename .github/workflows/{update_deps.yml => update-dependencies.yml} (67%) rename .github/workflows/{update_dep.yml => update-dependency.yml} (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 016a33da..de15924e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: ci +name: CI on: [pull_request, push] @@ -28,15 +28,13 @@ jobs: cache: pnpm - name: Install dependencies - run: pnpm i --frozen-lockfile + run: pnpm install --frozen-lockfile - name: Build run: pnpm run build - - name: Lint - run: | - pnpm run pretty:check - pnpm run eslint + - name: Check + run: pnpm run check - name: Test run: pnpm run test:coverage @@ -180,6 +178,7 @@ jobs: continue-on-error: true steps: - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 734191ff..992f247a 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -9,7 +9,7 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: 'CodeQL' +name: CodeQL on: push: diff --git a/.github/workflows/deps_review.yaml b/.github/workflows/dependency-review.yaml similarity index 92% rename from .github/workflows/deps_review.yaml rename to .github/workflows/dependency-review.yaml index 0436e746..b6a087a5 100644 --- a/.github/workflows/deps_review.yaml +++ b/.github/workflows/dependency-review.yaml @@ -1,4 +1,5 @@ -name: deps-review +name: Dependency review + on: [pull_request] permissions: diff --git a/.github/workflows/fail_pr_to_master.yaml b/.github/workflows/fail-pr-to-master.yaml similarity index 95% rename from .github/workflows/fail_pr_to_master.yaml rename to .github/workflows/fail-pr-to-master.yaml index 53e1c652..8ea9e0c0 100644 --- a/.github/workflows/fail_pr_to_master.yaml +++ b/.github/workflows/fail-pr-to-master.yaml @@ -6,7 +6,7 @@ on: - master jobs: - fail_pr: + fail-pr-to-master: runs-on: ubuntu-latest steps: - name: Fail PR to master diff --git a/.github/workflows/ghcr_cleanup.yml b/.github/workflows/ghcr-cleanup.yml similarity index 98% rename from .github/workflows/ghcr_cleanup.yml rename to .github/workflows/ghcr-cleanup.yml index 3e496aa3..623e70e6 100644 --- a/.github/workflows/ghcr_cleanup.yml +++ b/.github/workflows/ghcr-cleanup.yml @@ -1,7 +1,7 @@ on: workflow_dispatch: -name: ghcr-cleanup +name: GHCR cleanup permissions: {} jobs: diff --git a/.github/workflows/merge_master_to_dev.yml b/.github/workflows/merge-master-to-dev.yml similarity index 89% rename from .github/workflows/merge_master_to_dev.yml rename to .github/workflows/merge-master-to-dev.yml index 07eb6759..b5630e42 100644 --- a/.github/workflows/merge_master_to_dev.yml +++ b/.github/workflows/merge-master-to-dev.yml @@ -1,4 +1,4 @@ -name: merge-master-to-dev +name: Merge master to dev on: push: @@ -6,7 +6,7 @@ on: - master jobs: - merge_master_to_dev: + merge-master-to-dev: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release_please.yml b/.github/workflows/release-please.yml similarity index 99% rename from .github/workflows/release_please.yml rename to .github/workflows/release-please.yml index c55f379f..e9e39527 100644 --- a/.github/workflows/release_please.yml +++ b/.github/workflows/release-please.yml @@ -7,7 +7,7 @@ permissions: contents: write pull-requests: write -name: release-please +name: Release Please jobs: release-please: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ffa3ee40..4bf6e7f6 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,4 +1,4 @@ -name: stale +name: Stale on: schedule: diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update-dependencies.yml similarity index 67% rename from .github/workflows/update_deps.yml rename to .github/workflows/update-dependencies.yml index 42c521e6..0f54095a 100644 --- a/.github/workflows/update_deps.yml +++ b/.github/workflows/update-dependencies.yml @@ -1,22 +1,20 @@ name: Update dependencies + on: workflow_dispatch: schedule: - cron: '0 0 * * 0' permissions: - contents: read + contents: write + pull-requests: write jobs: - update_deps: - permissions: - contents: write # for peter-evans/create-pull-request to create branch - pull-requests: write # for peter-evans/create-pull-request to create a PR + update-dependencies: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: - ref: dev token: ${{ secrets.GH_TOKEN }} - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 @@ -24,10 +22,17 @@ jobs: node-version: 22 cache: pnpm - run: | + pnpm self-update pnpm up --latest - uses: peter-evans/create-pull-request@v7 + id: cpr with: commit-message: 'fix(ignore): update dependencies' branch: 'deps/all' title: 'fix(ignore): update dependencies' token: ${{ secrets.GH_TOKEN }} + - uses: peter-evans/create-or-update-comment@v4 + if: ${{ steps.cpr.outputs.pull-request-number }} + with: + issue-number: ${{ steps.cpr.outputs.pull-request-number }} + body: 'CC: @Koenkk' diff --git a/.github/workflows/update_dep.yml b/.github/workflows/update-dependency.yml similarity index 97% rename from .github/workflows/update_dep.yml rename to .github/workflows/update-dependency.yml index 66d91f50..579e1ced 100644 --- a/.github/workflows/update_dep.yml +++ b/.github/workflows/update-dependency.yml @@ -2,11 +2,11 @@ on: repository_dispatch: types: update_dep -name: update-dep +name: Update dependency permissions: {} jobs: - update_dep: + update-dependency: permissions: contents: write pull-requests: write diff --git a/package.json b/package.json index 80e45495..d18d9405 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "pretty:write": "prettier --write .", "pretty:check": "prettier --check .", "start": "node index.js", + "check": "pnpm run pretty:check && pnpm run eslint", "test": "vitest run --config ./test/vitest.config.mts", "test:coverage": "vitest run --config ./test/vitest.config.mts --coverage", "test:watch": "vitest watch --config ./test/vitest.config.mts",