Skip to content

Commit b0f4ac5

Browse files
authored
ci: supply correct tokens to workflow steps (open-telemetry#5936)
1 parent d646403 commit b0f4ac5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/create-or-update-release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
git config user.email [email protected]
5050
npm run github:create_or_update_release_pr
5151
env:
52-
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
52+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
5353
RELEASE_SCOPE: ${{ github.event.inputs.release_scope }}
5454
RELEASE_KIND: ${{ github.event.inputs.release_scope }}:${{ github.event.inputs.release_type }}
5555
RELEASE_PR_REMOTE: origin

.github/workflows/move-to-emeritus.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ jobs:
1919
cache-dependency-path: package-lock.json
2020
node-version: 22
2121

22+
- run: node scripts/move-to-emeritus.js
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2225
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
2326
id: otelbot-token
2427
with:
2528
app-id: ${{ vars.OTELBOT_APP_ID }}
2629
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
2730

28-
- run: node scripts/move-to-emeritus.js
29-
3031
- name: Create/Update Move to Emeritus PR
3132
run: |
3233
git config user.name otelbot

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"_github:update_release_pr_body:semconv": "node scripts/extract-latest-release-notes.js semantic-conventions/CHANGELOG.md && npm run _github:update_release_pr_body_from_file",
7272
"_verify_release_kind": "echo $RELEASE_KIND | grep -oE '^(all|sdk|experimental|semconv):(minor|patch)$'",
7373
"_verify_release_remote": "git remote get-url $RELEASE_PR_REMOTE",
74-
"_github:update_release_branch": "npm run _verify_release_kind && npm run _verify_release_remote && (git checkout main && git pull upstream main && git branch -D otelbot/prepare-next-version; git checkout -b otelbot/prepare-next-version && npm run prepare_release:$RELEASE_KIND && git commit -am \"chore: prepare release\" && git push --set-upstream $RELEASE_PR_REMOTE --force otelbot/prepare-next-version)",
74+
"_github:update_release_branch": "npm run _verify_release_kind && npm run _verify_release_remote && (git checkout main && git pull $RELEASE_PR_REMOTE main && git branch -D otelbot/prepare-next-version; git checkout -b otelbot/prepare-next-version && npm run prepare_release:$RELEASE_KIND && git commit -am \"chore: prepare release\" && git push --set-upstream $RELEASE_PR_REMOTE --force otelbot/prepare-next-version)",
7575
"github:create_or_update_release_pr": "npm run _github:update_release_branch && (gh pr create --repo open-telemetry/opentelemetry-js --title 'chore: prepare next release' --body ''; npm run _github:update_release_pr_body:$RELEASE_SCOPE)"
7676
},
7777
"repository": "open-telemetry/opentelemetry-js",

0 commit comments

Comments
 (0)