diff --git a/.github/workflows/update-jaeger.yml b/.github/workflows/update-jaeger.yml index 8872cd9ea..141e81a6b 100644 --- a/.github/workflows/update-jaeger.yml +++ b/.github/workflows/update-jaeger.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest env: BRANCH_NAME: update-jaeger - DEPENDENCIES_FILENAME: dependencies.json - JAEGER_DIFF_FILENAME: dependencies.diff steps: - uses: actions/checkout@v4 with: @@ -18,10 +16,12 @@ jobs: - name: Update dependencies.json run: | - echo ${{ toJson(github.event.client_payload) }} > dependencies.diff.json + echo ${{ toJson(github.event.client_payload) }} > dependencies_diff.json npm run update-jaeger - name: Commit, push changes and create PR + env: + GH_TOKEN: ${{ secrets.CONTENTS_WRITE_PAT }} run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" @@ -29,4 +29,4 @@ jobs: git add dependencies.json git commit -m "Update Jaeger dependencies" git push origin ${{ env.BRANCH_NAME }} - gh pr create -t "Update Jaeger dependencies" -B main -H ${{ env.BRANCH_NAME }} + gh pr create -f -B main diff --git a/scripts/update-jaeger.mts b/scripts/update-jaeger.mts index 90c04f3ed..ce00ecfcf 100644 --- a/scripts/update-jaeger.mts +++ b/scripts/update-jaeger.mts @@ -23,7 +23,7 @@ const readDependencyFile = async (path: string): Promise => { const dependenciesFilePath = path.resolve("./dependencies.json"); const dependencies = await readDependencyFile(dependenciesFilePath); -const dependenciesDiffFilePath = path.resolve("./dependencies.diff.json"); +const dependenciesDiffFilePath = path.resolve("./dependencies_diff.json"); const dependenciesDiff = await readDependencyFile(dependenciesDiffFilePath); const mergedDependencies = { ...dependencies, ...dependenciesDiff };