From c96e68776c3be07e9db00f495f26823a590dc54f Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Fri, 5 Jan 2024 18:12:19 -0800 Subject: [PATCH 1/2] Revert checkout action to upstream b/282361986 --- .github/workflows/gradle.yaml | 2 +- .github/workflows/label-cherry-pick.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/main.yaml | 12 ++++++------ .github/workflows/main_win.yaml | 8 ++++---- .github/workflows/manual-cherry-pick.yaml | 2 +- .github/workflows/nightly_trigger.yaml | 14 +++++++------- .github/workflows/nightly_trigger_24.lts.1+.yaml | 2 +- .github/workflows/pytest.yaml | 2 +- .github/workflows/workflow_trigger.yaml | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml index 7dec25a39585..9d198ba8204c 100644 --- a/.github/workflows/gradle.yaml +++ b/.github/workflows/gradle.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: kaidokert/checkout@v3.5.999 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 - name: Set up JDK 11 uses: actions/setup-java@v3 diff --git a/.github/workflows/label-cherry-pick.yaml b/.github/workflows/label-cherry-pick.yaml index 37dd6d62ab26..e0c3a0421402 100644 --- a/.github/workflows/label-cherry-pick.yaml +++ b/.github/workflows/label-cherry-pick.yaml @@ -61,7 +61,7 @@ jobs: CHERRY_PICK_BRANCH: cherry-pick-${{ matrix.target_branch }}-${{ github.event.pull_request.number }} steps: - name: Checkout repository - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: ref: ${{ matrix.target_branch }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 2132af2c83c4..e1e077849ef2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -37,7 +37,7 @@ jobs: unzip /tmp/gn.zip -d /usr/local/bin rm /tmp/gn.zip - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 0 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d5e1c15b2bac..33a52814b459 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -76,7 +76,7 @@ jobs: ) steps: - id: checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 1 @@ -150,7 +150,7 @@ jobs: packages: write steps: - name: Checkout files - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 0 @@ -186,7 +186,7 @@ jobs: runs-on: [self-hosted, linux-runner] steps: - name: Checkout files - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 2 @@ -233,7 +233,7 @@ jobs: TMPDIR: /__w/_temp steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: # Use fetch depth of 0 to get full history for a valid build id. @@ -337,7 +337,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 1 @@ -369,7 +369,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: fetch-depth: 1 diff --git a/.github/workflows/main_win.yaml b/.github/workflows/main_win.yaml index 146424bc2b74..d28e4ebad09b 100644 --- a/.github/workflows/main_win.yaml +++ b/.github/workflows/main_win.yaml @@ -63,7 +63,7 @@ jobs: ) steps: - id: Checkout - uses: kaidokert/checkout@v3.5.999 # Temporary version + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 persist-credentials: false @@ -135,7 +135,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout files - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 persist-credentials: false @@ -169,7 +169,7 @@ jobs: config: [devel, debug, qa, gold] steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: # Use fetch depth of 0 to get full history for a valid build id. fetch-depth: 0 @@ -206,7 +206,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 persist-credentials: false diff --git a/.github/workflows/manual-cherry-pick.yaml b/.github/workflows/manual-cherry-pick.yaml index f48cb117defc..bede1bda51a9 100644 --- a/.github/workflows/manual-cherry-pick.yaml +++ b/.github/workflows/manual-cherry-pick.yaml @@ -46,7 +46,7 @@ jobs: GITHUB_REF: ${{ github.ref }} steps: - name: Checkout code - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 timeout-minutes: 30 with: ref: ${{ env.RELEASE_BRANCH }} diff --git a/.github/workflows/nightly_trigger.yaml b/.github/workflows/nightly_trigger.yaml index 22f155674572..89a018fa55b2 100644 --- a/.github/workflows/nightly_trigger.yaml +++ b/.github/workflows/nightly_trigger.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 23.lts.1+ @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 22.lts.1+ @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 21.lts.1+ @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 20.lts.1+ @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 19.lts.1+ @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: rc_11 @@ -127,7 +127,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: COBALT_9 diff --git a/.github/workflows/nightly_trigger_24.lts.1+.yaml b/.github/workflows/nightly_trigger_24.lts.1+.yaml index 45ca3996b958..405f7efe671c 100644 --- a/.github/workflows/nightly_trigger_24.lts.1+.yaml +++ b/.github/workflows/nightly_trigger_24.lts.1+.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: 24.lts.1+ diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 1b282e407929..2b2b9c29e80d 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 persist-credentials: false diff --git a/.github/workflows/workflow_trigger.yaml b/.github/workflows/workflow_trigger.yaml index 402b41ff3539..911e775b1813 100644 --- a/.github/workflows/workflow_trigger.yaml +++ b/.github/workflows/workflow_trigger.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: kaidokert/checkout@v3.5.999 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 1 ref: ${{ github.event.branch }} From 59e4ff9d6c25a0bd4a2f2edd28a1479b09dccce7 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Wed, 27 Mar 2024 15:19:06 -0700 Subject: [PATCH 2/2] Fix versions --- .github/workflows/gradle.yaml | 2 +- .github/workflows/label-cherry-pick.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/main.yaml | 12 ++++++------ .github/workflows/main_win.yaml | 8 ++++---- .github/workflows/manual-cherry-pick.yaml | 2 +- .github/workflows/nightly_trigger.yaml | 14 +++++++------- .github/workflows/nightly_trigger_24.lts.1+.yaml | 2 +- .github/workflows/pytest.yaml | 2 +- .github/workflows/workflow_trigger.yaml | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml index 9d198ba8204c..4e5ebe328e4c 100644 --- a/.github/workflows/gradle.yaml +++ b/.github/workflows/gradle.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@v4 timeout-minutes: 30 - name: Set up JDK 11 uses: actions/setup-java@v3 diff --git a/.github/workflows/label-cherry-pick.yaml b/.github/workflows/label-cherry-pick.yaml index e0c3a0421402..2f6a425f8ecc 100644 --- a/.github/workflows/label-cherry-pick.yaml +++ b/.github/workflows/label-cherry-pick.yaml @@ -61,7 +61,7 @@ jobs: CHERRY_PICK_BRANCH: cherry-pick-${{ matrix.target_branch }}-${{ github.event.pull_request.number }} steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: ref: ${{ matrix.target_branch }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index e1e077849ef2..92bc21267e25 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -37,7 +37,7 @@ jobs: unzip /tmp/gn.zip -d /usr/local/bin rm /tmp/gn.zip - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 0 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 33a52814b459..2ef8a2bbf191 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -76,7 +76,7 @@ jobs: ) steps: - id: checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 1 @@ -150,7 +150,7 @@ jobs: packages: write steps: - name: Checkout files - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 0 @@ -186,7 +186,7 @@ jobs: runs-on: [self-hosted, linux-runner] steps: - name: Checkout files - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 2 @@ -233,7 +233,7 @@ jobs: TMPDIR: /__w/_temp steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: # Use fetch depth of 0 to get full history for a valid build id. @@ -337,7 +337,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 1 @@ -369,7 +369,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: fetch-depth: 1 diff --git a/.github/workflows/main_win.yaml b/.github/workflows/main_win.yaml index d28e4ebad09b..77c2a71f47b8 100644 --- a/.github/workflows/main_win.yaml +++ b/.github/workflows/main_win.yaml @@ -63,7 +63,7 @@ jobs: ) steps: - id: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 persist-credentials: false @@ -135,7 +135,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout files - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 persist-credentials: false @@ -169,7 +169,7 @@ jobs: config: [devel, debug, qa, gold] steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: # Use fetch depth of 0 to get full history for a valid build id. fetch-depth: 0 @@ -206,7 +206,7 @@ jobs: MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 persist-credentials: false diff --git a/.github/workflows/manual-cherry-pick.yaml b/.github/workflows/manual-cherry-pick.yaml index bede1bda51a9..bfdc95ac4f2f 100644 --- a/.github/workflows/manual-cherry-pick.yaml +++ b/.github/workflows/manual-cherry-pick.yaml @@ -46,7 +46,7 @@ jobs: GITHUB_REF: ${{ github.ref }} steps: - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 timeout-minutes: 30 with: ref: ${{ env.RELEASE_BRANCH }} diff --git a/.github/workflows/nightly_trigger.yaml b/.github/workflows/nightly_trigger.yaml index 89a018fa55b2..6c6a0e235477 100644 --- a/.github/workflows/nightly_trigger.yaml +++ b/.github/workflows/nightly_trigger.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 23.lts.1+ @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 22.lts.1+ @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 21.lts.1+ @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 20.lts.1+ @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 19.lts.1+ @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: rc_11 @@ -127,7 +127,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: COBALT_9 diff --git a/.github/workflows/nightly_trigger_24.lts.1+.yaml b/.github/workflows/nightly_trigger_24.lts.1+.yaml index 405f7efe671c..531306ee94ec 100644 --- a/.github/workflows/nightly_trigger_24.lts.1+.yaml +++ b/.github/workflows/nightly_trigger_24.lts.1+.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: 24.lts.1+ diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 2b2b9c29e80d..9a66b79b719a 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 persist-credentials: false diff --git a/.github/workflows/workflow_trigger.yaml b/.github/workflows/workflow_trigger.yaml index 911e775b1813..c226cc08b05e 100644 --- a/.github/workflows/workflow_trigger.yaml +++ b/.github/workflows/workflow_trigger.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 1 ref: ${{ github.event.branch }}