diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26f15e868b..8befd2416d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,7 @@ jobs: - name: Setup env uses: the-guild-org/shared-config/setup@main with: - nodeVersion: 18 + nodeVersion: 24 - name: Build run: yarn build env: @@ -63,7 +63,7 @@ jobs: - name: Setup env uses: the-guild-org/shared-config/setup@main with: - nodeVersion: 18 + nodeVersion: 24 - name: Build run: yarn build env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2099adb73c..36dacdfddf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,13 +15,3 @@ jobs: if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }} secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} - - release: - uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main - with: - npmTag: alpha - buildScript: build - nodeVersion: 18 - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000000..13fdd4c432 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,36 @@ +name: release +on: + pull_request: # for snapshot release + branches: + - main + + push: # for stable release + branches: + - main + +jobs: + release-snapshot: + if: github.event_name == 'pull_request' + uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main + permissions: + id-token: write # allows ODIC publishing + pull-requests: write # allows creating comment with alpha versions + with: + npmTag: alpha + buildScript: build + nodeVersion: 24 + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + npmToken: FILLER + + release-stable: + if: github.event_name == 'push' + uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main + permissions: + id-token: write # allows ODIC publishing + with: + releaseScript: release + nodeVersion: 24 + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + npmToken: FILLER diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index e36a97d1f3..0000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: release -on: - push: - branches: - - main - -jobs: - stable: - uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main - with: - releaseScript: release - nodeVersion: 18 - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} diff --git a/packages/presets/near-operation-file/package.json b/packages/presets/near-operation-file/package.json index 7192f6b60d..acb8bc5563 100644 --- a/packages/presets/near-operation-file/package.json +++ b/packages/presets/near-operation-file/package.json @@ -5,7 +5,7 @@ "description": "GraphQL Code Generator preset for generating operation code near the operation file", "repository": { "type": "git", - "url": "https://github.com/dotansimha/graphql-code-generator-community.git", + "url": "git+https://github.com/dotansimha/graphql-code-generator-community.git", "directory": "packages/presets/near-operation-file" }, "license": "MIT",