diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 37414c0c71ff6..beb3d7e6365b5 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,12 +15,12 @@ jobs: timeout-minutes: 10 steps: - uses: linkerd/dev/actions/setup-tools@v43 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: just-dev lint-actions devcontainer-versions: runs-on: ubuntu-22.04 steps: - uses: linkerd/dev/actions/setup-tools@v43 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: just-dev check-action-images diff --git a/.github/workflows/choco.yml b/.github/workflows/choco.yml index aa48ae4ab351e..af06bf850c7ac 100644 --- a/.github/workflows/choco.yml +++ b/.github/workflows/choco.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: devblackops/github-action-psscriptanalyzer@854038567344559afaaa8ccb7a014452b99d86ee env: # https://github.com/devblackops/github-action-psscriptanalyzer/pull/3/files diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index d0268f86b172e..87c9b978ebd6a 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -16,7 +16,7 @@ jobs: container: image: golang:1.22 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: go install gotest.tools/gotestsum@v0.4.2 - run: gotestsum -- -cover -coverprofile=coverage.out -v -mod=readonly ./... - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed @@ -31,7 +31,7 @@ jobs: container: image: node:20-stretch steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Yarn setup shell: bash run: bin/scurl -o- https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1 --network-concurrency 1 @@ -54,7 +54,7 @@ jobs: image: docker://rust:1.76.0 options: --security-opt seccomp=unconfined steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - shell: bash run: mkdir -p target && cd target && bin/scurl -v https://github.com/xd009642/tarpaulin/releases/download/0.27.3/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz | tar zxvf - && chmod 755 cargo-tarpaulin - run: target/cargo-tarpaulin tarpaulin --workspace --out Xml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5aacf244904e2..f864f80157efb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: with: go-version: "1.22" - name: Checkout - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Initialize # Unpinned action version so that we automatically get analyzer updates. diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index 60daa14c1409c..2eab41b472be8 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-rust steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - shell: bash run: | # Extract current Rust version from the toolchain file. @@ -40,5 +40,5 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: linkerd/dev/actions/setup-tools@v43 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: just-dev pull-dev-image diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 68a2d09ed16ab..b55b97bc39f75 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -8,7 +8,7 @@ jobs: meta: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: tj-actions/changed-files@0874344d6ebbaa00a27da73276ae7162fadcaf69 id: changed with: @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-go steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just go-lint --verbose --timeout=10m @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-go steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just go-fmt @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-go steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just go-fetch - run: just go-test diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 1f2d5a77ab669..a4628989e08b5 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -16,6 +16,6 @@ jobs: timeout-minutes: 5 steps: - uses: linkerd/dev/actions/setup-tools@v43 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: helm-docs - run: git diff --exit-code -- **/charts/**/README.md diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 89cea874bdbcc..c4424f1d1459f 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -25,7 +25,7 @@ jobs: meta: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - id: tag run: echo "tag=$(CI_FORCE_CLEAN=1 bin/root-tag)" >> "$GITHUB_OUTPUT" - uses: tj-actions/changed-files@0874344d6ebbaa00a27da73276ae7162fadcaf69 @@ -120,7 +120,7 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 15 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: ./.github/actions/docker-build id: build with: @@ -135,7 +135,7 @@ jobs: docker cp "$id:/out/linkerd-linux-amd64" /home/runner/archives/linkerd v=$(/home/runner/archives/linkerd version --short --client) [[ "$v" == '${{ needs.meta.outputs.tag }}' ]] || exit 1 - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 + - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba with: name: image-archives-cli path: /home/runner/archives @@ -158,7 +158,7 @@ jobs: - proxy timeout-minutes: 20 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: ./.github/actions/docker-build id: build env: @@ -172,7 +172,7 @@ jobs: run: | mkdir -p /home/runner/archives docker save '${{ steps.build.outputs.image }}' >'/home/runner/archives/${{ matrix.component }}.tar' - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 + - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba with: name: image-archives-${{ matrix.component }} path: /home/runner/archives @@ -188,11 +188,11 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 15 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: pattern: image-archives-* path: image-archives @@ -223,8 +223,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: olix0r/cargo-action-fmt/setup@9269f3aa1ff01775d95efc97037e2cbdb41d9684 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: pattern: image-archives-* path: image-archives @@ -281,7 +281,7 @@ jobs: - web timeout-minutes: 15 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: ./.github/actions/docker-build id: build with: @@ -293,7 +293,7 @@ jobs: run: | mkdir -p /home/runner/archives docker save '${{ steps.build.outputs.image }}' >'/home/runner/archives/${{ matrix.component }}.tar' - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 + - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba with: name: image-archives-${{ matrix.component }} path: /home/runner/archives @@ -316,11 +316,11 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 15 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: pattern: image-archives-* path: image-archives @@ -341,11 +341,11 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 15 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: pattern: image-archives-* path: image-archives @@ -375,11 +375,11 @@ jobs: - uses: extractions/setup-just@dd310ad5a97d8e7b41793f8ef055398d51ad4de6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" - - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + - uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: pattern: image-archives-* path: image-archives diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index f8c1105898a3b..fecec278d7104 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -19,7 +19,7 @@ jobs: env: NODE_ENV: test steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Yarn setup shell: bash run: | diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index be691044bf75c..898496653342b 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -14,7 +14,7 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 with: globs: | diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index 9ce920a550c05..42596e55d74cc 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -18,6 +18,6 @@ jobs: container: ghcr.io/linkerd/dev:v43-go steps: - run: apt update && apt install -y unzip - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: bin/protoc-diff diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b4041b95a5e2..43c1f93f26c10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: tag: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: echo "tag=$(CI_FORCE_CLEAN=1 bin/root-tag)" >> "$GITHUB_OUTPUT" id: tag outputs: @@ -48,7 +48,7 @@ jobs: # policy-controller docker builds have occasionally hit a 30-minute timeout. timeout-minutes: 45 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Set tag run: echo 'TAG=${{ needs.tag.outputs.tag }}' >> "$GITHUB_ENV" - uses: ./.github/actions/docker-build @@ -83,7 +83,7 @@ jobs: # https://github.com/actions/upload-artifact/issues/8 - name: Upload artifact if: matrix.component == 'cli-bin' - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 + uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba with: name: image-archives-cli path: /home/runner/archives @@ -95,12 +95,12 @@ jobs: needs: [docker_build] steps: - name: Checkout code - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" - name: Download image archives - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d with: name: image-archives-cli path: image-archives @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" @@ -152,7 +152,7 @@ jobs: runs-on: [self-hosted, Linux, ARM64] timeout-minutes: 30 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 with: go-version: "1.22" @@ -200,7 +200,7 @@ jobs: steps: - name: Checkout code if: startsWith(github.ref, 'refs/tags/stable') - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Chocolatey - update nuspec if: startsWith(github.ref, 'refs/tags/stable') run: | @@ -213,7 +213,7 @@ jobs: args: pack bin/win/linkerd.nuspec - name: Chocolatey - upload package if: startsWith(github.ref, 'refs/tags/stable') - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 + uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba with: name: choco path: ./linkerd.*.nupkg @@ -230,10 +230,10 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # - name: Download choco package # if: startsWith(github.ref, 'refs/tags/stable') - # uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 + # uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # with: # name: choco # path: choco @@ -278,7 +278,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/stable') || startsWith(github.ref, 'refs/tags/edge') runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Set install target for stable if: startsWith(github.ref, 'refs/tags/stable') run: echo "INSTALL=install" >> "$GITHUB_ENV" @@ -306,7 +306,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout code - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: Log into GCP uses: "google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c" with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 08bf596bba4c4..76fb53e1346a1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,7 +35,7 @@ jobs: # Prevent sudden announcement of a new advisory from failing Ci. continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - uses: EmbarkStudios/cargo-deny-action@b01e7a8cfb1f496c52d77361e84c1840d8246393 with: command: check ${{ matrix.checks }} @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-rust steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just rs-check-fmt @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-rust steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just rs-fetch - run: just rs-clippy @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-22.04 container: ghcr.io/linkerd/dev:v43-rust steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just rs-fetch - run: just rs-check-dirs @@ -76,7 +76,7 @@ jobs: timeout-minutes: 15 container: ghcr.io/linkerd/dev:v43-rust steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 - run: just rs-fetch - run: just rs-test-build @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 2 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - shell: bash run: | toolchain_version="$(./bin/rust-toolchain-version)" diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml index 8b6f142b16816..59c74fa5a3859 100644 --- a/.github/workflows/shell.yml +++ b/.github/workflows/shell.yml @@ -17,5 +17,5 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: linkerd/dev/actions/setup-tools@v43 - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - run: just sh-lint diff --git a/.github/workflows/sync-proxy.yml b/.github/workflows/sync-proxy.yml index a213b8ddbb67d..d9ac3a03ed19f 100644 --- a/.github/workflows/sync-proxy.yml +++ b/.github/workflows/sync-proxy.yml @@ -64,7 +64,7 @@ jobs: env: VERSION: ${{ needs.meta.outputs.name }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f with: token: ${{ secrets.LINKERD2_PROXY_GITHUB_TOKEN || github.token }} - name: Check if proxy version has changed @@ -98,7 +98,7 @@ jobs: git config --global --add safe.directory "$PWD" # actions/runner#2033 git config --global user.name "$GITHUB_USERNAME" git config --global user.email "$GITHUB_USERNAME"@users.noreply.github.com - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f with: token: ${{ secrets.LINKERD2_PROXY_GITHUB_TOKEN || github.token }} - name: Commit proxy version diff --git a/Cargo.lock b/Cargo.lock index 613dd4803f9a2..a788b660b0d5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1867,9 +1867,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring", diff --git a/go.mod b/go.mod index 73608207bfd5d..6a4d551420804 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 github.com/prometheus/client_golang v1.19.0 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.52.3 + github.com/prometheus/common v0.53.0 github.com/sergi/go-diff v1.3.1 github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 06577e0aa5e2f..aa426e7a6d8d7 100644 --- a/go.sum +++ b/go.sum @@ -378,8 +378,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA= -github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= +github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= diff --git a/web/app/package.json b/web/app/package.json index 77e6d1212a9b1..a84ce967178b2 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -7,7 +7,7 @@ "@babel/eslint-plugin": "7.23.5", "@fortawesome/fontawesome-svg-core": "6.5.2", "@fortawesome/free-regular-svg-icons": "6.5.2", - "@fortawesome/free-solid-svg-icons": "6.5.1", + "@fortawesome/free-solid-svg-icons": "6.5.2", "@fortawesome/react-fontawesome": "0.2.0", "@lingui/core": "^3.17.1", "@lingui/macro": "3.17.2", @@ -16,7 +16,7 @@ "@material-ui/icons": "4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", "classnames": "2.5.1", - "core-js": "^3.36.1", + "core-js": "^3.37.0", "css-mediaquery": "^0.1.2", "d3-drag": "3.0.0", "d3-force": "3.0.0", @@ -76,10 +76,10 @@ "react-test-renderer": "16.14.0", "sinon": "17.0.1", "sinon-stub-promise": "4.0.0", - "style-loader": "^3.3.4", + "style-loader": "^4.0.0", "url-loader": "^4.1.1", "webpack": "^5.91.0", - "webpack-bundle-analyzer": "4.10.1", + "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4" }, diff --git a/web/app/yarn.lock b/web/app/yarn.lock index 2bcf9c0877c3d..4465ca416f7ab 100644 --- a/web/app/yarn.lock +++ b/web/app/yarn.lock @@ -1219,11 +1219,6 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@fortawesome/fontawesome-common-types@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz#fdb1ec4952b689f5f7aa0bffe46180bb35490032" - integrity sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A== - "@fortawesome/fontawesome-common-types@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz#eaf2f5699f73cef198454ebc0c414e3688898179" @@ -1243,12 +1238,12 @@ dependencies: "@fortawesome/fontawesome-common-types" "6.5.2" -"@fortawesome/free-solid-svg-icons@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz#737b8d787debe88b400ab7528f47be333031274a" - integrity sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ== +"@fortawesome/free-solid-svg-icons@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz#9b40b077b27400a5e9fcbf2d15b986c7be69e9ca" + integrity sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw== dependencies: - "@fortawesome/fontawesome-common-types" "6.5.1" + "@fortawesome/fontawesome-common-types" "6.5.2" "@fortawesome/react-fontawesome@0.2.0": version "0.2.0" @@ -3442,10 +3437,10 @@ core-js-compat@^3.31.0, core-js-compat@^3.36.1: dependencies: browserslist "^4.23.0" -core-js@^3.36.1: - version "3.36.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.1.tgz#c97a7160ebd00b2de19e62f4bbd3406ab720e578" - integrity sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA== +core-js@^3.37.0: + version "3.37.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb" + integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug== core-util-is@~1.0.0: version "1.0.3" @@ -5791,11 +5786,6 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" @@ -8648,7 +8638,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -8666,6 +8656,15 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -8756,7 +8755,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8790,10 +8796,10 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -style-loader@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7" - integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w== +style-loader@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-4.0.0.tgz#0ea96e468f43c69600011e0589cb05c44f3b17a5" + integrity sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA== supports-color@^5.3.0: version "5.5.0" @@ -9298,10 +9304,10 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== -webpack-bundle-analyzer@4.10.1: - version "4.10.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454" - integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ== +webpack-bundle-analyzer@4.10.2: + version "4.10.2" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd" + integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw== dependencies: "@discoveryjs/json-ext" "0.5.7" acorn "^8.0.4" @@ -9311,7 +9317,6 @@ webpack-bundle-analyzer@4.10.1: escape-string-regexp "^4.0.0" gzip-size "^6.0.0" html-escaper "^2.0.2" - is-plain-object "^5.0.0" opener "^1.5.2" picocolors "^1.0.0" sirv "^2.0.3" @@ -9567,7 +9572,16 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==