diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index bfb12ace1a..489b06c06b 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -56,8 +56,8 @@ jobs: run: | npm install --ignore-scripts --package-lock-only git add package-lock.json - git config user.name opentelemetrybot - git config user.email 107717825+opentelemetrybot@users.noreply.github.com + git config user.name otelbot + git config user.email 197425009+otelbot@users.noreply.github.com git commit -m "chore: sync package-lock.json" git push diff --git a/.github/workflows/update-otel-deps.yaml b/.github/workflows/update-otel-deps.yaml index 45d061ca01..0134e87635 100644 --- a/.github/workflows/update-otel-deps.yaml +++ b/.github/workflows/update-otel-deps.yaml @@ -12,23 +12,16 @@ jobs: permissions: contents: write # required for pushing changes steps: - - name: Fork - run: gh repo fork open-telemetry/opentelemetry-js-contrib - env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + id: otelbot-token + with: + app-id: ${{ vars.OTELBOT_APP_ID }} + private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }} - name: Checkout uses: actions/checkout@v4 with: - repository: opentelemetrybot/opentelemetry-js-contrib ref: main - token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} - - name: Sync with upstream - run: | - git remote show origin - git remote add upstream https://github.com/open-telemetry/opentelemetry-js-contrib.git - git fetch upstream - git reset --hard upstream/main - git push origin main --force + token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-node@v4 with: @@ -42,12 +35,16 @@ jobs: - name: Create/Update Release PR run: | - git config user.name opentelemetrybot - git config user.email 107717825+opentelemetrybot@users.noreply.github.com - git checkout -b feat/update-otel-deps + git config user.name otelbot + git config user.email 197425009+otelbot@users.noreply.github.com + git checkout -b otelbot/feat-update-otel-deps node ./scripts/update-otel-deps.js git commit -am "feat(deps): update deps matching '@opentelemetry/*'" - git push --set-upstream origin feat/update-otel-deps --force - gh pr create --repo open-telemetry/opentelemetry-js-contrib --title "feat(deps): update deps matching '@opentelemetry/*'" --body 'Updates all `@opentelemetry/*` dependencies to latest' + git push --set-upstream origin otelbot/feat-update-otel-deps --force + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create PR + run: | + gh pr create --title "feat(deps): update deps matching '@opentelemetry/*'" --body 'Updates all `@opentelemetry/*` dependencies to latest' env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}