From 9c820df65254e04e7d960817b67b58dbc8e16aeb Mon Sep 17 00:00:00 2001 From: Adam Matthiesen <30383579+Adammatthiesen@users.noreply.github.com> Date: Wed, 14 Feb 2024 03:20:21 -0800 Subject: [PATCH 1/9] Update release.yml --- .github/workflows/release.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90644dd6..8a0a3194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,16 +15,15 @@ jobs: name: Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 18 - - run: npm ci + node-version: 20 - name: Publish to npm id: changesets uses: changesets/action@v1 with: - publish: npm run release + publish: pnpm release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From e33707f8cb825ca121dea79c5650dc870764631e Mon Sep 17 00:00:00 2001 From: Adam Matthiesen <30383579+Adammatthiesen@users.noreply.github.com> Date: Wed, 14 Feb 2024 03:22:44 -0800 Subject: [PATCH 2/9] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a0a3194..8e598381 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: id: changesets uses: changesets/action@v1 with: - publish: pnpm release + publish: npm run release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From bbd0c81619cfab36db9a1fd2ab2c59f5ecebee2f Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:41:33 -0800 Subject: [PATCH 3/9] update workflow --- .github/workflows/release.yml | 45 +++++++++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e598381..515dbcb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,29 +1,38 @@ -name: Release +name: Changesets on: push: branches: - main -concurrency: ${{ github.workflow }}-${{ github.ref }} -permissions: {} #reset +env: + CI: true + PNPM_CACHE_FOLDER: .pnpm-store jobs: - release: - # IMPORTANT: prevent this action from running on forks - if: github.repository == 'MatthiesenXYZ/astro-ghostcms' - permissions: - contents: write # to create release (changesets/action) - pull-requests: write # to create pull request (changesets/action) - name: Release + version: + timeout-minutes: 15 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - name: checkout code repository + uses: actions/checkout@v3 with: - node-version: 20 - - name: Publish to npm - id: changesets + fetch-depth: 0 + - name: setup node.js + uses: actions/setup-node@v3 + with: + node-version: 14 + - name: install pnpm + run: npm i pnpm@latest -g + - name: Setup npmrc + run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc + - name: setup pnpm config + run: pnpm config set store-dir $PNPM_CACHE_FOLDER + - name: install dependencies + run: pnpm install + - name: create and publish versions uses: changesets/action@v1 with: - publish: npm run release + version: pnpm ci:version + commit: "chore: update versions" + title: "chore: update versions" + publish: pnpm ci:publish env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/package.json b/package.json index e8144223..17c2b9da 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ }, "scripts": { "lint": "biome check .", - "changeset": "changeset", - "release": "changeset publish", + "ci:version": "pnpm changeset version", + "vi:publish": "pnpm changeset publish", "lint:fix": "biome check --apply .", "playground:dev": "pnpm --filter playground dev", "api:test": "pnpm --filter astro-ghostcms test", From 04958e7d0285f5ba22043227cf1dc00ea279e1f2 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:43:40 -0800 Subject: [PATCH 4/9] update workflow: node version --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 515dbcb2..a13cb4c1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,13 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout code repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: setup node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 14 + node-version: 18 - name: install pnpm run: npm i pnpm@latest -g - name: Setup npmrc From f4e0da81aa9cdb4e231e52190d3d717e57276436 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:45:50 -0800 Subject: [PATCH 5/9] update pnpm-lock --- pnpm-lock.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eee91098..100cf8d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,7 +30,7 @@ importers: specifier: ^3.0.5 version: 3.0.5 '@matthiesenxyz/astro-ghostcms-theme-default': - specifier: ^0.1.9 + specifier: ^0.1.10 version: link:../astro-ghostcms-theme-default '@resvg/resvg-js': specifier: ^2.6.0 @@ -124,11 +124,11 @@ importers: specifier: ^1.1.8 version: 1.1.8 '@matthiesenxyz/astro-ghostcms': - specifier: ^3.2.1 + specifier: ^3.2.3 version: link:../astro-ghostcms '@matthiesenxyz/astro-ghostcms-rendercontent': - specifier: ^0.0.1 - version: 0.0.1 + specifier: ^0.0.3 + version: link:../astro-ghostcms-rendercontent '@unocss/astro': specifier: ^0.57.7 version: 0.57.7(vite@5.0.12) @@ -185,7 +185,7 @@ importers: specifier: ^5.0.16 version: 5.0.16 '@matthiesenxyz/astro-ghostcms': - specifier: ^3.1.8 + specifier: ^3.2.3 version: link:../astro-ghostcms '@tailwindcss/typography': specifier: ^0.5.10 @@ -219,7 +219,7 @@ importers: packages/astro-ghostcms-theme-default: dependencies: '@matthiesenxyz/astro-ghostcms': - specifier: ^3.1.8 + specifier: ^3.2.3 version: link:../astro-ghostcms astro: specifier: ^4.2.1 @@ -1500,13 +1500,6 @@ packages: globby: 11.1.0 read-yaml-file: 1.1.0 - /@matthiesenxyz/astro-ghostcms-rendercontent@0.0.1: - resolution: {integrity: sha512-2zXmCnAoFHZqvkEuccUY0uN/legpXxn0LzVvERc2w8bjTnOPTB+fQN35fc+OiyFZJEy+jgcvwM76ZA3dVgPayQ==} - dependencies: - entities: 4.5.0 - ultrahtml: 1.5.2 - dev: false - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} From b483ec28379c98d118293b222473da3b31043d89 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:48:12 -0800 Subject: [PATCH 6/9] test workflow --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17c2b9da..f382902b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "lint": "biome check .", "ci:version": "pnpm changeset version", - "vi:publish": "pnpm changeset publish", + "vi:publish": "pnpm publish -r", "lint:fix": "biome check --apply .", "playground:dev": "pnpm --filter playground dev", "api:test": "pnpm --filter astro-ghostcms test", From 51343ab53c5c068e06ae52a66c726a900ce0d459 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:50:17 -0800 Subject: [PATCH 7/9] test --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a13cb4c1..15d38a99 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,6 @@ jobs: version: pnpm ci:version commit: "chore: update versions" title: "chore: update versions" - publish: pnpm ci:publish + publish: pnpm changeset publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 3705d45a85c869a57176e3eb1405d35b25926c8a Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Wed, 14 Feb 2024 03:53:56 -0800 Subject: [PATCH 8/9] test --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15d38a99..5e454f59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,4 +35,4 @@ jobs: title: "chore: update versions" publish: pnpm changeset publish env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} \ No newline at end of file From acbf74ffcce9ee078dbe10c0d0687cb45b7bc3b7 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen <30383579+Adammatthiesen@users.noreply.github.com> Date: Wed, 14 Feb 2024 04:04:55 -0800 Subject: [PATCH 9/9] Create changeset-dependabot.yml --- .github/workflows/changeset-dependabot.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/changeset-dependabot.yml diff --git a/.github/workflows/changeset-dependabot.yml b/.github/workflows/changeset-dependabot.yml new file mode 100644 index 00000000..3d13338e --- /dev/null +++ b/.github/workflows/changeset-dependabot.yml @@ -0,0 +1,15 @@ +name: "Dependabot Changesets" + +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + changesets: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot Changesets + uses: feelepxyz/dependabot-changesets@v1