From b45a998579de7338b7125292a02c5ee5bf8fa2c4 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 14:44:44 -0700 Subject: [PATCH 1/8] bump `actions/checkout`, `create-pull-request` and use `GITHUB_TOKEN` for creating the PR --- .github/workflows/ci.yml | 6 +++--- .github/workflows/coverage.yml | 4 ++-- .github/workflows/pypiupload.yml | 2 +- .github/workflows/spec_update.yml | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0d85f3c..bf1c6fc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - os: ubuntu-20.04 python-version: 2.7 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.7.0 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | @@ -49,7 +49,7 @@ jobs: Docs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.7.0 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -84,7 +84,7 @@ jobs: - os: ubuntu-20.04 python-version: 2.7 steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.7.0 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7cab535b..6c45933b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: Coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.7.0 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -36,7 +36,7 @@ jobs: IntegrationCoverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.7.0 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: diff --git a/.github/workflows/pypiupload.yml b/.github/workflows/pypiupload.yml index 874a32b4..45bbd157 100644 --- a/.github/workflows/pypiupload.yml +++ b/.github/workflows/pypiupload.yml @@ -15,7 +15,7 @@ jobs: python-version: [2.7, 3.x] steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.7.0 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index 5010e1a8..d931210d 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -8,7 +8,7 @@ jobs: Update: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.7.0 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -51,10 +51,9 @@ jobs: pip install -r requirements.txt python generate_base_client.py - name: Create Pull Request - uses: peter-evans/create-pull-request@v5.0.0 + uses: peter-evans/create-pull-request@v5.0.3 if: steps.git-diff-num.outputs.num-diff != 0 with: - token: ${{ secrets.SPEC_UPDATE_TOKEN }} commit-message: | ${{ steps.git-diff.outputs.commit}} branch: ${{ steps.git-branch.outputs.branch }} From 9c1273ccabfc01fccc803941b9a7b2879c6b06af Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 14:56:42 -0700 Subject: [PATCH 2/8] fix review request --- .github/workflows/spec_update.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index d931210d..da2ae43a 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -62,7 +62,5 @@ jobs: body: | ${{ steps.git-diff.outputs.commit}} base: 'main' - team-reviewers: | - owners - maintainers + team-reviewers: "@dropbox/sdk-maintainers" draft: false From 3db5128159fb5ed45f03d21e602b20bf283017de Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 16:34:39 -0700 Subject: [PATCH 3/8] token --- .github/workflows/spec_update.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index da2ae43a..ec053788 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -54,6 +54,7 @@ jobs: uses: peter-evans/create-pull-request@v5.0.3 if: steps.git-diff-num.outputs.num-diff != 0 with: + token: ${{ secrets.SPEC_UPDATE_TOKEN }} commit-message: | ${{ steps.git-diff.outputs.commit}} branch: ${{ steps.git-branch.outputs.branch }} From 16e5d5e15c74a7240fb939bad191822ef87c9bfb Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 16:48:43 -0700 Subject: [PATCH 4/8] also use token in checkout --- .github/workflows/spec_update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index ec053788..3adc95b0 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -9,6 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.7.0 + with: + token: ${{ secrets.SPEC_UPDATE_TOKEN }} - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: From 81046f8fd67e7895735cbb1ff240fea72f27b86e Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 17:45:57 -0700 Subject: [PATCH 5/8] use `GITHUB_TOKEN` instead, stop using `team-reviewers` --- .github/workflows/spec_update.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index 3adc95b0..d9e862ad 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.7.0 - with: - token: ${{ secrets.SPEC_UPDATE_TOKEN }} - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -56,7 +54,6 @@ jobs: uses: peter-evans/create-pull-request@v5.0.3 if: steps.git-diff-num.outputs.num-diff != 0 with: - token: ${{ secrets.SPEC_UPDATE_TOKEN }} commit-message: | ${{ steps.git-diff.outputs.commit}} branch: ${{ steps.git-branch.outputs.branch }} @@ -65,5 +62,4 @@ jobs: body: | ${{ steps.git-diff.outputs.commit}} base: 'main' - team-reviewers: "@dropbox/sdk-maintainers" draft: false From d662f738c9c227ef8d524c3bcb56b92654950ed4 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 17:47:15 -0700 Subject: [PATCH 6/8] todo --- .github/workflows/spec_update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index d9e862ad..acbef11f 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -62,4 +62,6 @@ jobs: body: | ${{ steps.git-diff.outputs.commit}} base: 'main' + # TODO: `SPEC_UPDATE_TOKEN` needs to be fixed + # team-reviewers: "@dropbox/sdk-maintainers" draft: false From c3b29c4019f5b1a2e9f77804349a2354f35fc173 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 17:51:41 -0700 Subject: [PATCH 7/8] whoops --- .github/workflows/ci.yml | 6 +++--- .github/workflows/coverage.yml | 4 ++-- .github/workflows/pypiupload.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf1c6fc8..c0d85f3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - os: ubuntu-20.04 python-version: 2.7 steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | @@ -49,7 +49,7 @@ jobs: Docs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -84,7 +84,7 @@ jobs: - os: ubuntu-20.04 python-version: 2.7 steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2.3.4 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6c45933b..7cab535b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: Coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: @@ -36,7 +36,7 @@ jobs: IntegrationCoverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2 - name: Setup Python environment uses: actions/setup-python@v3.1.4 with: diff --git a/.github/workflows/pypiupload.yml b/.github/workflows/pypiupload.yml index 45bbd157..874a32b4 100644 --- a/.github/workflows/pypiupload.yml +++ b/.github/workflows/pypiupload.yml @@ -15,7 +15,7 @@ jobs: python-version: [2.7, 3.x] steps: - - uses: actions/checkout@v2.7.0 + - uses: actions/checkout@v2.3.4 - if: ${{ matrix.python-version == '2.7' }} name: Setup Python environment (2.7) run: | From f691206d329138f745dbd9094997acf0e839f364 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Thu, 9 May 2024 17:54:05 -0700 Subject: [PATCH 8/8] clarify --- .github/workflows/spec_update.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index acbef11f..2f21a278 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -54,6 +54,8 @@ jobs: uses: peter-evans/create-pull-request@v5.0.3 if: steps.git-diff-num.outputs.num-diff != 0 with: + # TODO: `SPEC_UPDATE_TOKEN` is broken + # token: ${{ secrets.SPEC_UPDATE_TOKEN }} commit-message: | ${{ steps.git-diff.outputs.commit}} branch: ${{ steps.git-branch.outputs.branch }} @@ -62,6 +64,6 @@ jobs: body: | ${{ steps.git-diff.outputs.commit}} base: 'main' - # TODO: `SPEC_UPDATE_TOKEN` needs to be fixed - # team-reviewers: "@dropbox/sdk-maintainers" + # TODO: `SPEC_UPDATE_TOKEN` is broken + # team-reviewers: "sdk-maintainers" draft: false