From daaaafb5200acaead82b74eac097fb00c3b02d42 Mon Sep 17 00:00:00 2001 From: rory Date: Fri, 21 Oct 2022 15:49:56 -0700 Subject: [PATCH 1/3] Upgrade actions/checkout to latest --- .github/actions/composite/setupNode/action.yml | 2 +- .github/actions/composite/updateProtectedBranch/action.yml | 2 +- .github/workflows/cherryPick.yml | 2 +- .github/workflows/createNewVersion.yml | 2 +- .github/workflows/deploy.yml | 4 ++-- .github/workflows/deployBlocker.yml | 2 +- .github/workflows/lockDeploys.yml | 2 +- .github/workflows/platformDeploy.yml | 2 +- .github/workflows/preDeploy.yml | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml index 369d1c52f8cd..29cb9ee59f17 100644 --- a/.github/actions/composite/setupNode/action.yml +++ b/.github/actions/composite/setupNode/action.yml @@ -5,7 +5,7 @@ runs: using: composite steps: # Version: 3.0.2 - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: fetch-depth: 0 diff --git a/.github/actions/composite/updateProtectedBranch/action.yml b/.github/actions/composite/updateProtectedBranch/action.yml index 292bba0f782c..b726f0bd09ac 100644 --- a/.github/actions/composite/updateProtectedBranch/action.yml +++ b/.github/actions/composite/updateProtectedBranch/action.yml @@ -48,7 +48,7 @@ runs: fi # Version: 3.0.2 - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: ref: ${{ env.SOURCE_BRANCH }} fetch-depth: 0 diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index b0945f4e0920..2bf13f29dac2 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -37,7 +37,7 @@ jobs: steps: # Version: 2.3.4 - name: Checkout staging branch - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: ref: staging token: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 5c31a0bb125c..5f1d32ee3b8b 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -47,7 +47,7 @@ jobs: steps: # Version: 3.0.2 - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: fetch-depth: 0 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a370083d2a86..9ea7920323d5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout staging branch - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: ref: staging token: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -50,7 +50,7 @@ jobs: if: ${{ fromJSON(needs.validate.outputs.isAutomatedPullRequest) && github.ref == 'refs/heads/production' }} steps: - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: fetch-depth: 0 token: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml index b074b271a883..30e937722596 100644 --- a/.github/workflows/deployBlocker.yml +++ b/.github/workflows/deployBlocker.yml @@ -11,7 +11,7 @@ jobs: if: ${{ github.event.label.name == 'DeployBlockerCash' }} steps: - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index ee42988cbc58..38764561ed59 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -10,7 +10,7 @@ jobs: runs-on: macos-12 steps: # Version: 2.3.4 - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: ref: main fetch-depth: 0 diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 9ea99d82ee2a..b6d3265e817b 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -269,7 +269,7 @@ jobs: if: ${{ success() }} needs: [android, desktop, iOS, web] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 - name: Set version run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV" diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index b3bdd40c703d..f6ff46266ca7 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -105,7 +105,7 @@ jobs: INPUTS: '{ "PULL_REQUEST_NUMBER": "${{ needs.chooseDeployActions.outputs.MERGED_PR }}", "NEW_VERSION": "${{ needs.createNewVersion.outputs.NEW_VERSION }}" }' # Version: 3.0.2 - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: ref: staging fetch-depth: 0 @@ -189,7 +189,7 @@ jobs: if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }} steps: # Version: 2.3.4 - - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: token: ${{ secrets.OS_BOTIFY_TOKEN }} From 682635adcdb7ed29ac409794cba766d8cc061717 Mon Sep 17 00:00:00 2001 From: rory Date: Fri, 21 Oct 2022 15:52:56 -0700 Subject: [PATCH 2/3] Upgrade actions/setup-node --- .github/actions/composite/setupNode/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml index 29cb9ee59f17..2e92ac26d667 100644 --- a/.github/actions/composite/setupNode/action.yml +++ b/.github/actions/composite/setupNode/action.yml @@ -4,12 +4,11 @@ description: Set up Node runs: using: composite steps: - # Version: 3.0.2 - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 with: fetch-depth: 0 - - uses: actions/setup-node@09ba51f18e18a3756fea1f54d09c6745c064491d + - uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 with: node-version-file: '.nvmrc' cache: npm From 5cc64aff4bbc12e8c24623a47f09b598d063ad8d Mon Sep 17 00:00:00 2001 From: rory Date: Fri, 21 Oct 2022 15:54:52 -0700 Subject: [PATCH 3/3] Upgrade ruby/setup-ruby --- .github/workflows/e2ePerformanceRegressionTests.yml | 2 +- .github/workflows/platformDeploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2ePerformanceRegressionTests.yml b/.github/workflows/e2ePerformanceRegressionTests.yml index 1639c45bd446..a59eb8c0dbff 100644 --- a/.github/workflows/e2ePerformanceRegressionTests.yml +++ b/.github/workflows/e2ePerformanceRegressionTests.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: Expensify/App/.github/actions/composite/setupNode@main - - uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a + - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: ruby-version: '2.7' bundler-cache: true diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index b6d3265e817b..a57dc69e3554 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -33,7 +33,7 @@ jobs: steps: - uses: Expensify/App/.github/actions/composite/setupNode@main - - uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a + - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: ruby-version: '2.7' bundler-cache: true @@ -132,7 +132,7 @@ jobs: steps: - uses: Expensify/App/.github/actions/composite/setupNode@main - - uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a + - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7 with: ruby-version: '2.7' bundler-cache: true