diff --git a/.changeset/config.json b/.changeset/config.json index ae82eba..7272b2e 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,10 +1,10 @@ { "$schema": "https://unpkg.com/@changesets/config@3.0.2/schema.json", - "changelog": "@changesets/cli/changelog", + "changelog": ["@changesets/changelog-github", { "repo": "changesets/ghcommit" }], "commit": false, "fixed": [], "linked": [], - "access": "restricted", + "access": "public", "baseBranch": "main", "updateInternalDependencies": "patch", "ignore": [] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 62e323f..d5eae74 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,5 @@ name: CI Checks -on: +on: pull_request: push: branches: @@ -23,7 +23,7 @@ jobs: run: | VERSION=$(cat package.json | grep '"packageManager": "pnpm@' | sed 's/.*"pnpm@\([^"]*\)".*/\1/') npm install -g pnpm@$VERSION - - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v 4.2.3 + - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: ~/.pnpm-store key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} diff --git a/.github/workflows/release-and-publish.yaml b/.github/workflows/release-and-publish.yaml index 6bc90ea..ff5f4ac 100644 --- a/.github/workflows/release-and-publish.yaml +++ b/.github/workflows/release-and-publish.yaml @@ -8,14 +8,11 @@ on: permissions: contents: write pull-requests: write - id-token: write jobs: release-and-publish: runs-on: ubuntu-latest - environment: main steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -28,20 +25,16 @@ jobs: VERSION=$(cat package.json | grep '"packageManager": "pnpm@' | sed 's/.*"pnpm@\([^"]*\)".*/\1/') npm install -g pnpm@$VERSION - name: Cache pnpm modules - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v 4.2.3 + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: ~/.pnpm-store key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - run: pnpm install --frozen-lockfile - run: pnpm build - - name: Configure PNPM to use token - run: - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> .npmrc - name: Run Changeset Workflow - uses: s0/changesets-action@63d3e3fda2c00696414ca2d6683e046289c13fd8 # v2.1.0 + uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc # v1.4.10 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} with: publish: pnpm changeset publish - createGithubReleases: true diff --git a/.npmrc b/.npmrc index 7881e59..ae64359 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ -provenance=true //registry.npmjs.org/:_authToken=${NPM_TOKEN} diff --git a/package.json b/package.json index 60c123b..8b4a99f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "@changesets/ghcommit", "version": "1.3.0", - "private": false, "description": "Directly change files on github using the github API, to support GPG signing", "keywords": [ "actions", @@ -56,6 +55,7 @@ "devDependencies": { "@actions/github": "^6.0.0", "@changesets/cli": "^2.27.7", + "@changesets/changelog-github": "^0.5.1", "@graphql-codegen/cli": "^5.0.2", "@graphql-codegen/import-types-preset": "^3.0.0", "@graphql-codegen/typescript": "^4.0.4", @@ -92,4 +92,4 @@ "dependencies": { "isomorphic-git": "^1.27.1" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f84c04b..e37a6f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,6 +15,9 @@ importers: '@actions/github': specifier: ^6.0.0 version: 6.0.0 + '@changesets/changelog-github': + specifier: ^0.5.1 + version: 0.5.1 '@changesets/cli': specifier: ^2.27.7 version: 2.27.7 @@ -470,6 +473,9 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} + '@changesets/changelog-github@0.5.1': + resolution: {integrity: sha512-BVuHtF+hrhUScSoHnJwTELB4/INQxVFc+P/Qdt20BLiBFIHFJDDUaGsZw+8fQeJTRP5hJZrzpt3oZWh0G19rAQ==} + '@changesets/cli@2.27.7': resolution: {integrity: sha512-6lr8JltiiXPIjDeYg4iM2MeePP6VN/JkmqBsVA5XRiy01hGS3y629LtSDvKcycj/w/5Eur1rEwby/MjcYS+e2A==} hasBin: true @@ -483,6 +489,9 @@ packages: '@changesets/get-dependents-graph@2.1.1': resolution: {integrity: sha512-LRFjjvigBSzfnPU2n/AhFsuWR5DK++1x47aq6qZ8dzYsPtS/I5mNhIGAS68IAxh1xjO9BTtz55FwefhANZ+FCA==} + '@changesets/get-github-info@0.6.0': + resolution: {integrity: sha512-v/TSnFVXI8vzX9/w3DU2Ol+UlTZcu3m0kXTjTT4KlAdwSvwutcByYwyYn9hwerPWfPkT2JfpoX0KgvCEi8Q/SA==} + '@changesets/get-release-plan@4.0.3': resolution: {integrity: sha512-6PLgvOIwTSdJPTtpdcr3sLtGatT+Jr22+cQwEBJBy6wP0rjB4yJ9lv583J9fVpn1bfQlBkDa8JxbS2g/n9lIyA==} @@ -513,6 +522,9 @@ packages: '@changesets/types@6.0.0': resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} + '@changesets/types@6.1.0': + resolution: {integrity: sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==} + '@changesets/write@0.3.1': resolution: {integrity: sha512-SyGtMXzH3qFqlHKcvFY2eX+6b0NGiFcNav8AFsYwy5l8hejOeoeTDemu5Yjmke2V5jpzY+pBvM0vCCQ3gdZpfw==} @@ -1787,6 +1799,9 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} + dataloader@1.4.0: + resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} + dataloader@2.2.2: resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==} @@ -1872,6 +1887,10 @@ packages: resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} engines: {node: '>=12'} + dotenv@8.6.0: + resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} + engines: {node: '>=10'} + dset@3.1.4: resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} engines: {node: '>=4'} @@ -4141,6 +4160,14 @@ snapshots: dependencies: '@changesets/types': 6.0.0 + '@changesets/changelog-github@0.5.1': + dependencies: + '@changesets/get-github-info': 0.6.0 + '@changesets/types': 6.1.0 + dotenv: 8.6.0 + transitivePeerDependencies: + - encoding + '@changesets/cli@2.27.7': dependencies: '@babel/runtime': 7.24.8 @@ -4198,6 +4225,13 @@ snapshots: fs-extra: 7.0.1 semver: 7.6.2 + '@changesets/get-github-info@0.6.0': + dependencies: + dataloader: 1.4.0 + node-fetch: 2.7.0 + transitivePeerDependencies: + - encoding + '@changesets/get-release-plan@4.0.3': dependencies: '@babel/runtime': 7.24.8 @@ -4258,6 +4292,8 @@ snapshots: '@changesets/types@6.0.0': {} + '@changesets/types@6.1.0': {} + '@changesets/write@0.3.1': dependencies: '@babel/runtime': 7.24.8 @@ -5945,6 +5981,8 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + dataloader@1.4.0: {} + dataloader@2.2.2: {} dateformat@4.6.3: {} @@ -6000,6 +6038,8 @@ snapshots: dotenv@16.4.5: {} + dotenv@8.6.0: {} + dset@3.1.4: {} eastasianwidth@0.2.0: {}