From a425f9040e1a044d8353398c2052c1ceaf4d8144 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 15 Mar 2025 15:31:21 -0600 Subject: [PATCH 1/4] pin gha --- .github/workflows/backport.yml | 2 +- .github/workflows/inter-branch-merge-flow.yml | 2 +- .github/workflows/locker.yml | 2 +- .github/workflows/markdownlint.yml | 4 ++-- .github/workflows/runtime-sync.yml | 8 ++++---- .github/workflows/update-jquery-validate.yml | 6 +++--- .github/workflows/update-sdk.yml | 2 +- .../update-selenium-and-playwright-dependencies.yml | 2 +- .github/workflows/validate-npm-package-lock-json.yml | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 7581f56ee981..543d67721362 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ permissions: jobs: backport: - uses: dotnet/arcade/.github/workflows/backport-base.yml@main + uses: dotnet/arcade/.github/workflows/backport-base.yml@1912d9f4fc410d421a01b5a09131aae234b603fa # main with: pr_description_template: | Backport of #%source_pr_number% to %target_branch% diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml index 20246c14fc58..a34149d96a2b 100644 --- a/.github/workflows/inter-branch-merge-flow.yml +++ b/.github/workflows/inter-branch-merge-flow.yml @@ -10,4 +10,4 @@ permissions: jobs: Merge: - uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main \ No newline at end of file + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@1912d9f4fc410d421a01b5a09131aae234b603fa # main \ No newline at end of file diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml index 592b01424740..3f7e292a1186 100644 --- a/.github/workflows/locker.yml +++ b/.github/workflows/locker.yml @@ -23,7 +23,7 @@ jobs: if: ${{ github.repository_owner == 'dotnet' }} steps: - name: Checkout Actions - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: repository: "microsoft/vscode-github-triage-actions" path: ./actions diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index 41149467e7a6..44263f24517c 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Use Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 with: node-version: 16.x - name: Run Markdownlint diff --git a/.github/workflows/runtime-sync.yml b/.github/workflows/runtime-sync.yml index 7dd10fa99595..631e07596978 100644 --- a/.github/workflows/runtime-sync.yml +++ b/.github/workflows/runtime-sync.yml @@ -21,14 +21,14 @@ jobs: runs-on: windows-latest steps: - name: Checkout aspnetcore - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: # Test this script using changes in a fork repository: 'dotnet/aspnetcore' path: aspnetcore ref: main - name: Checkout runtime - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: # Test this script using changes in a fork repository: 'dotnet/runtime' @@ -47,7 +47,7 @@ jobs: mkdir ..\artifacts git status > ..\artifacts\status.txt git diff > ..\artifacts\diff.txt - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 with: name: results path: artifacts @@ -64,7 +64,7 @@ jobs: - name: Send PR if: steps.check.outputs.sendpr == 'true' # https://github.com/marketplace/actions/create-pull-request - uses: dotnet/actions-create-pull-request@v4 + uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4 with: token: ${{ secrets.GITHUB_TOKEN }} path: .\aspnetcore diff --git a/.github/workflows/update-jquery-validate.yml b/.github/workflows/update-jquery-validate.yml index d30b0dcc49ab..4f05833b7da6 100644 --- a/.github/workflows/update-jquery-validate.yml +++ b/.github/workflows/update-jquery-validate.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 with: node-version: '20.x' @@ -39,7 +39,7 @@ jobs: run: node update-jquery-validate.mjs - name: Create Pull Request - uses: dotnet/actions-create-pull-request@v4 + uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update jquery.validate to ${{ env.JQUERY_VALIDATE_VERSION }} diff --git a/.github/workflows/update-sdk.yml b/.github/workflows/update-sdk.yml index b56cc522439a..7d15ba2499cc 100644 --- a/.github/workflows/update-sdk.yml +++ b/.github/workflows/update-sdk.yml @@ -19,7 +19,7 @@ jobs: name: Update .NET SDK runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: martincostello/update-dotnet-sdk@76e2c0df2303d4f6a404228105ebb7d60ace0556 # v3.4.0 with: quality: 'daily' diff --git a/.github/workflows/update-selenium-and-playwright-dependencies.yml b/.github/workflows/update-selenium-and-playwright-dependencies.yml index 5356372c300e..2ec95b68e939 100644 --- a/.github/workflows/update-selenium-and-playwright-dependencies.yml +++ b/.github/workflows/update-selenium-and-playwright-dependencies.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Update dependencies run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1 diff --git a/.github/workflows/validate-npm-package-lock-json.yml b/.github/workflows/validate-npm-package-lock-json.yml index 74517b153788..7274b68cb145 100644 --- a/.github/workflows/validate-npm-package-lock-json.yml +++ b/.github/workflows/validate-npm-package-lock-json.yml @@ -14,13 +14,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 submodules: false - name: Set up Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 with: node-version: 20.x From ba57c98c124370328592855b15a117c590a93f77 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 15 Mar 2025 16:53:05 -0600 Subject: [PATCH 2/4] use detailed tag --- .github/workflows/locker.yml | 2 +- .github/workflows/markdownlint.yml | 4 ++-- .github/workflows/runtime-sync.yml | 8 ++++---- .github/workflows/update-jquery-validate.yml | 6 +++--- .github/workflows/update-sdk.yml | 2 +- .../update-selenium-and-playwright-dependencies.yml | 2 +- .github/workflows/validate-npm-package-lock-json.yml | 4 ++-- src/submodules/googletest | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml index 3f7e292a1186..cb80ba0da414 100644 --- a/.github/workflows/locker.yml +++ b/.github/workflows/locker.yml @@ -23,7 +23,7 @@ jobs: if: ${{ github.repository_owner == 'dotnet' }} steps: - name: Checkout Actions - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: "microsoft/vscode-github-triage-actions" path: ./actions diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index 44263f24517c..6f104e600b08 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Use Node.js - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: node-version: 16.x - name: Run Markdownlint diff --git a/.github/workflows/runtime-sync.yml b/.github/workflows/runtime-sync.yml index 631e07596978..17d199e1e536 100644 --- a/.github/workflows/runtime-sync.yml +++ b/.github/workflows/runtime-sync.yml @@ -21,14 +21,14 @@ jobs: runs-on: windows-latest steps: - name: Checkout aspnetcore - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: # Test this script using changes in a fork repository: 'dotnet/aspnetcore' path: aspnetcore ref: main - name: Checkout runtime - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: # Test this script using changes in a fork repository: 'dotnet/runtime' @@ -47,7 +47,7 @@ jobs: mkdir ..\artifacts git status > ..\artifacts\status.txt git diff > ..\artifacts\diff.txt - - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 + - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 with: name: results path: artifacts @@ -64,7 +64,7 @@ jobs: - name: Send PR if: steps.check.outputs.sendpr == 'true' # https://github.com/marketplace/actions/create-pull-request - uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4 + uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3 with: token: ${{ secrets.GITHUB_TOKEN }} path: .\aspnetcore diff --git a/.github/workflows/update-jquery-validate.yml b/.github/workflows/update-jquery-validate.yml index 4f05833b7da6..788a28ee7979 100644 --- a/.github/workflows/update-jquery-validate.yml +++ b/.github/workflows/update-jquery-validate.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Node.js - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: node-version: '20.x' @@ -39,7 +39,7 @@ jobs: run: node update-jquery-validate.mjs - name: Create Pull Request - uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4 + uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update jquery.validate to ${{ env.JQUERY_VALIDATE_VERSION }} diff --git a/.github/workflows/update-sdk.yml b/.github/workflows/update-sdk.yml index 7d15ba2499cc..bb18b8b4ed79 100644 --- a/.github/workflows/update-sdk.yml +++ b/.github/workflows/update-sdk.yml @@ -19,7 +19,7 @@ jobs: name: Update .NET SDK runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: martincostello/update-dotnet-sdk@76e2c0df2303d4f6a404228105ebb7d60ace0556 # v3.4.0 with: quality: 'daily' diff --git a/.github/workflows/update-selenium-and-playwright-dependencies.yml b/.github/workflows/update-selenium-and-playwright-dependencies.yml index 2ec95b68e939..6e25e08b9400 100644 --- a/.github/workflows/update-selenium-and-playwright-dependencies.yml +++ b/.github/workflows/update-selenium-and-playwright-dependencies.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Update dependencies run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1 diff --git a/.github/workflows/validate-npm-package-lock-json.yml b/.github/workflows/validate-npm-package-lock-json.yml index 7274b68cb145..23e0a0ebf5ed 100644 --- a/.github/workflows/validate-npm-package-lock-json.yml +++ b/.github/workflows/validate-npm-package-lock-json.yml @@ -14,13 +14,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 submodules: false - name: Set up Node.js - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: node-version: 20.x diff --git a/src/submodules/googletest b/src/submodules/googletest index 4902ea2d7c6f..2b6b042a7744 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 4902ea2d7c6faed89b6facee00baa34bb108fc0d +Subproject commit 2b6b042a77446ff322cd7522ca068d9f2a21c1d1 From 1b757e51a0b83124685d1a808314b1655c7c2e29 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Mon, 17 Mar 2025 09:32:52 -0600 Subject: [PATCH 3/4] Update .github/workflows/backport.yml Co-authored-by: Jeff Handley --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 543d67721362..e6e88727d935 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ permissions: jobs: backport: - uses: dotnet/arcade/.github/workflows/backport-base.yml@1912d9f4fc410d421a01b5a09131aae234b603fa # main + uses: dotnet/arcade/.github/workflows/backport-base.yml@66269f6a88f6062f2cccf6eb84660a8a6f5cc5ec # 2025-01-13 with: pr_description_template: | Backport of #%source_pr_number% to %target_branch% From 4467d72036095e93507fbe39a70255632af83099 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Mon, 17 Mar 2025 09:32:59 -0600 Subject: [PATCH 4/4] Update .github/workflows/inter-branch-merge-flow.yml Co-authored-by: Jeff Handley --- .github/workflows/inter-branch-merge-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml index a34149d96a2b..7bea0f1718b4 100644 --- a/.github/workflows/inter-branch-merge-flow.yml +++ b/.github/workflows/inter-branch-merge-flow.yml @@ -10,4 +10,4 @@ permissions: jobs: Merge: - uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@1912d9f4fc410d421a01b5a09131aae234b603fa # main \ No newline at end of file + uses: dotnet/arcade/.github/workflows/backport-base.yml@2e09b2a8a74223d25086d947e2d070827f6c556e# 2024-06-24 \ No newline at end of file