From 445650d3290598fe8d97b79acd2d5b09c3d22945 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Wed, 22 Jan 2025 15:24:49 -0500 Subject: [PATCH 1/7] add provenance config --- packages/cli/package.json | 8 +++++++- packages/ts/package.json | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 6fd6dbd3a..91af5b1e1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -73,7 +73,13 @@ "vitest": "^2.1.8" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true + }, + "repository": { + "type": "git", + "url": "https://github.com/graphprotocol/graph-tooling.git", + "directory": "packages/cli" }, "oclif": { "bin": "graph", diff --git a/packages/ts/package.json b/packages/ts/package.json index 0deaf2f15..709a6af60 100644 --- a/packages/ts/package.json +++ b/packages/ts/package.json @@ -11,6 +11,15 @@ "lint": "prettier -c **/*.{js,mjs,ts}", "test": "node test/test.mjs" }, + "publishConfig": { + "access": "public", + "provenance": true + }, + "repository": { + "type": "git", + "url": "https://github.com/graphprotocol/graph-tooling.git", + "directory": "packages/ts" + }, "dependencies": { "assemblyscript": "0.27.31" } From 1db111213a5890b12a9952ad6e8ef797cd2ecb88 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Wed, 22 Jan 2025 21:31:04 -0500 Subject: [PATCH 2/7] fix gh actions --- .github/workflows/pr.yml | 83 +++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f8f31a8a0..ba229808a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,28 +14,65 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} alpha: - uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main - if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }} - with: - npmTag: alpha - buildScript: build - nodeVersion: 20 - packageManager: pnpm - packageManagerVersion: 9.1.0 - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} + runs-on: ubuntu-24.04 + if: + ${{ github.event.pull_request.title != 'Upcoming Release Changes' && + github.event.pull_request.head.repo.full_name == github.repository }} + outputs: + published: ${{ steps.changesets.outputs.published }} + publishedPackages: ${{ steps.changesets.outputs.publishedPackages }} + steps: + - name: checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + + - uses: the-guild-org/shared-config/setup@main + name: setup env + with: + nodeVersion: '20' + packageManager: pnpm + packageManagerVersion: '9.1.0' + + - name: alpha release + id: changesets + uses: the-guild-org/changesets-snapshot-action@v0.0.2 + with: + tag: alpha + prepareScript: 'pnpm run build' + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-candidate: - uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main - if: ${{ github.event.pull_request.title == 'Upcoming Release Changes' }} - with: - npmTag: rc - buildScript: build - nodeVersion: 20 - packageManager: pnpm - packageManagerVersion: 9.1.0 - restoreDeletedChangesets: true - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} + runs-on: ubuntu-24.04 + if: + ${{ github.event.pull_request.title == 'Upcoming Release Changes' && + github.event.pull_request.head.repo.full_name == github.repository }} + outputs: + published: ${{ steps.changesets.outputs.published }} + publishedPackages: ${{ steps.changesets.outputs.publishedPackages }} + steps: + - name: checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + + - uses: the-guild-org/shared-config/setup@main + name: setup env + with: + nodeVersion: '20' + packageManager: pnpm + packageManagerVersion: '9.1.0' + + - name: release candidate + id: changesets + uses: the-guild-org/changesets-snapshot-action@v0.0.2 + with: + tag: rc + prepareScript: 'pnpm run build' + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fbd661bd0405cff36094035f4c3e0a9ea2ce0860 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Wed, 22 Jan 2025 21:33:40 -0500 Subject: [PATCH 3/7] fix gh actions release --- .github/workflows/pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ba229808a..581489326 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,8 +42,10 @@ jobs: tag: alpha prepareScript: 'pnpm run build' env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_CONFIG_PROVENANCE: true release-candidate: runs-on: ubuntu-24.04 From ce106d50e79a50dc1b6d8904d3a736d7d6364a38 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Wed, 22 Jan 2025 21:38:18 -0500 Subject: [PATCH 4/7] change npm token --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 581489326..d53cb5916 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,8 +42,8 @@ jobs: tag: alpha prepareScript: 'pnpm run build' env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }} + NPM_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_CONFIG_PROVENANCE: true From ddd4caaa65ebdbe40dc86fc76341e2c4efef2e45 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Wed, 22 Jan 2025 21:54:28 -0500 Subject: [PATCH 5/7] revert token --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d53cb5916..581489326 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,8 +42,8 @@ jobs: tag: alpha prepareScript: 'pnpm run build' env: - NODE_AUTH_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }} - NPM_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_CONFIG_PROVENANCE: true From f61c20289a59a662b739a59c9e63894fb169d28c Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Thu, 23 Jan 2025 15:50:56 -0500 Subject: [PATCH 6/7] fix gh actions --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 581489326..04d85b56c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,7 +42,6 @@ jobs: tag: alpha prepareScript: 'pnpm run build' env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_CONFIG_PROVENANCE: true @@ -78,3 +77,4 @@ jobs: env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_CONFIG_PROVENANCE: true From 363a75efdb5331f418606e70cf1ea9dbe5affbdf Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Thu, 23 Jan 2025 16:12:59 -0500 Subject: [PATCH 7/7] revert gh action --- .github/workflows/pr.yml | 85 +++++++++++----------------------------- 1 file changed, 23 insertions(+), 62 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 04d85b56c..f8f31a8a0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,67 +14,28 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} alpha: - runs-on: ubuntu-24.04 - if: - ${{ github.event.pull_request.title != 'Upcoming Release Changes' && - github.event.pull_request.head.repo.full_name == github.repository }} - outputs: - published: ${{ steps.changesets.outputs.published }} - publishedPackages: ${{ steps.changesets.outputs.publishedPackages }} - steps: - - name: checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - - uses: the-guild-org/shared-config/setup@main - name: setup env - with: - nodeVersion: '20' - packageManager: pnpm - packageManagerVersion: '9.1.0' - - - name: alpha release - id: changesets - uses: the-guild-org/changesets-snapshot-action@v0.0.2 - with: - tag: alpha - prepareScript: 'pnpm run build' - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_CONFIG_PROVENANCE: true + uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main + if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }} + with: + npmTag: alpha + buildScript: build + nodeVersion: 20 + packageManager: pnpm + packageManagerVersion: 9.1.0 + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + npmToken: ${{ secrets.NPM_TOKEN }} release-candidate: - runs-on: ubuntu-24.04 - if: - ${{ github.event.pull_request.title == 'Upcoming Release Changes' && - github.event.pull_request.head.repo.full_name == github.repository }} - outputs: - published: ${{ steps.changesets.outputs.published }} - publishedPackages: ${{ steps.changesets.outputs.publishedPackages }} - steps: - - name: checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - - uses: the-guild-org/shared-config/setup@main - name: setup env - with: - nodeVersion: '20' - packageManager: pnpm - packageManagerVersion: '9.1.0' - - - name: release candidate - id: changesets - uses: the-guild-org/changesets-snapshot-action@v0.0.2 - with: - tag: rc - prepareScript: 'pnpm run build' - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_CONFIG_PROVENANCE: true + uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main + if: ${{ github.event.pull_request.title == 'Upcoming Release Changes' }} + with: + npmTag: rc + buildScript: build + nodeVersion: 20 + packageManager: pnpm + packageManagerVersion: 9.1.0 + restoreDeletedChangesets: true + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + npmToken: ${{ secrets.NPM_TOKEN }}