Skip to content

Commit 675575a

Browse files
wgjak47wgjak47
committed
Merge branch 'main' of github.com:wgjak47/linkerd2-proxy
2 parents 76ba679 + e86c9af commit 675575a

File tree

67 files changed

+468
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+468
-392
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
"DEV_VERSION": "v46",
6+
"DEV_VERSION": "v47",
77
"http_proxy": "${localEnv:http_proxy}",
88
"https_proxy": "${localEnv:https_proxy}"
99
}

‎.github/workflows/beta.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ permissions:
2323
jobs:
2424
build:
2525
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
26-
container: ghcr.io/linkerd/dev:v46-rust
26+
container: ghcr.io/linkerd/dev:v47-rust
2727
timeout-minutes: 20
2828
continue-on-error: true
2929
steps:
3030
- run: rustup toolchain install --profile=minimal beta
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
31+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3232
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3333
- run: just toolchain=beta fetch
3434
- run: just toolchain=beta build

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
timeout-minutes: 5
2424
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
2525
steps:
26-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
26+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2727
- id: changed
2828
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
2929
with:
@@ -43,12 +43,12 @@ jobs:
4343
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
4444
timeout-minutes: 30
4545
container:
46-
image: docker://ghcr.io/linkerd/dev:v46-rust
46+
image: docker://ghcr.io/linkerd/dev:v47-rust
4747
options: --security-opt seccomp=unconfined # 🤷
4848
env:
4949
CXX: "/usr/bin/clang++-19"
5050
steps:
51-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
51+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
5252
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0
5353
- run: cargo tarpaulin --locked --workspace --exclude=linkerd2-proxy --exclude=linkerd-transport-header --exclude=opencensus-proto --exclude=spire-proto --no-run
5454
- run: cargo tarpaulin --locked --workspace --exclude=linkerd2-proxy --exclude=linkerd-transport-header --exclude=opencensus-proto --exclude=spire-proto --skip-clean --ignore-tests --no-fail-fast --out=Xml

‎.github/workflows/fuzzers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
container: docker://rust:1.88.0
3131
steps:
3232
- run: apt update && apt install -y jo
33-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
33+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3434
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3535
- uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
3636
id: changed-files
@@ -55,7 +55,7 @@ jobs:
5555
steps:
5656
- run: rustup toolchain add nightly
5757
- run: cargo install cargo-fuzz
58-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
58+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
5959
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
6060
- working-directory: ${{matrix.dir}}
6161
run: cargo +nightly fetch

‎.github/workflows/markdown.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 5
1515
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1818
- uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
1919
with:
2020
globs: "**/*.md"

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ permissions:
2323
jobs:
2424
build:
2525
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
26-
container: ghcr.io/linkerd/dev:v46-rust
26+
container: ghcr.io/linkerd/dev:v47-rust
2727
timeout-minutes: 20
2828
continue-on-error: true
2929
steps:
3030
- run: rustup toolchain install --profile=minimal nightly
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
31+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3232
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3333
- run: just toolchain=nightly fetch
3434
- run: just toolchain=nightly profile=release build

‎.github/workflows/pr.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 5
1717
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2020
- id: build
2121
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
2222
with:
@@ -76,22 +76,22 @@ jobs:
7676
if: needs.meta.outputs.actions_changed == 'true'
7777
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
7878
steps:
79-
- uses: linkerd/dev/actions/setup-tools@v46
80-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
79+
- uses: linkerd/dev/actions/setup-tools@v47
80+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
8181
- run: just action-lint
8282
- run: just action-dev-check
8383

8484
rust:
8585
needs: meta
8686
if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true'
8787
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
88-
container: ghcr.io/linkerd/dev:v46-rust
88+
container: ghcr.io/linkerd/dev:v47-rust
8989
permissions:
9090
contents: read
9191
timeout-minutes: 20
9292
steps:
9393
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
94-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
94+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
9595
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0
9696
- run: just fetch
9797
- run: cargo deny --all-features check bans licenses sources
@@ -108,13 +108,13 @@ jobs:
108108
if: needs.meta.outputs.cargo_changed == 'true'
109109
timeout-minutes: 20
110110
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
111-
container: ghcr.io/linkerd/dev:v46-rust
111+
container: ghcr.io/linkerd/dev:v47-rust
112112
strategy:
113113
matrix:
114114
crate: ${{ fromJson(needs.meta.outputs.cargo_crates) }}
115115
steps:
116116
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
117-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
117+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
118118
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0
119119
- run: just fetch
120120
- run: just check-crate ${{ matrix.crate }}
@@ -127,7 +127,7 @@ jobs:
127127
env:
128128
WAIT_TIMEOUT: 2m
129129
steps:
130-
- uses: linkerd/dev/actions/setup-tools@v46
130+
- uses: linkerd/dev/actions/setup-tools@v47
131131
- name: scurl https://run.linkerd.io/install-edge | sh
132132
run: |
133133
scurl https://run.linkerd.io/install-edge | sh
@@ -136,7 +136,7 @@ jobs:
136136
tag=$(linkerd version --client --short)
137137
echo "linkerd $tag"
138138
echo "LINKERD_TAG=$tag" >> "$GITHUB_ENV"
139-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
139+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
140140
- run: just docker
141141
- run: just k3d-create
142142
- run: just k3d-load-linkerd
@@ -168,7 +168,7 @@ jobs:
168168
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
169169
run: exit 1
170170

171-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
171+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
172172
if: needs.meta.outputs.is_dependabot == 'true' && needs.meta.outputs.any_changed == 'true'
173173
- name: "Merge dependabot changes"
174174
if: needs.meta.outputs.is_dependabot == 'true' && needs.meta.outputs.any_changed == 'true'

‎.github/workflows/release-weekly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
4545
timeout-minutes: 5
4646
steps:
47-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
47+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
4848
- name: Check if the most recent commit is after the last release
4949
id: recency
5050
env:

‎.github/workflows/release.yml‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ on:
4646
default: true
4747

4848
env:
49+
CARGO: "cargo auditable"
4950
CARGO_INCREMENTAL: 0
5051
CARGO_NET_RETRY: 10
5152
RUSTFLAGS: "-D warnings -A deprecated --cfg tokio_unstable"
@@ -60,48 +61,62 @@ jobs:
6061
timeout-minutes: 5
6162
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
6263
steps:
63-
- id: meta
64+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
65+
if: github.event_name == 'pull_request'
66+
- id: workflow
67+
if: github.event_name == 'pull_request'
68+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
69+
with:
70+
files: |
71+
.github/workflows/release.yml
72+
- id: build
73+
if: github.event_name == 'pull_request'
74+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
75+
with:
76+
files: |
77+
justfile
78+
Cargo.toml
79+
80+
- id: version
6481
env:
6582
VERSION: ${{ inputs.version }}
6683
shell: bash
6784
run: |
6885
set -euo pipefail
6986
shopt -s extglob
7087
if [[ "$GITHUB_EVENT_NAME" == pull_request ]]; then
71-
echo version="0.0.0-test.${GITHUB_SHA:0:7}"
72-
echo archs='["amd64"]'
73-
echo oses='["linux"]'
88+
echo version="0.0.0-test.${GITHUB_SHA:0:7}" >> "$GITHUB_OUTPUT"
7489
exit 0
75-
fi >> "$GITHUB_OUTPUT"
90+
fi
7691
if ! [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+)?(\+[0-9A-Za-z-]+)?$ ]]; then
7792
echo "Invalid version: $VERSION" >&2
7893
exit 1
7994
fi
80-
( echo version="${VERSION#v}"
81-
echo archs='["amd64", "arm64", "arm"]'
95+
echo version="${VERSION#v}" >> "$GITHUB_OUTPUT"
96+
97+
- id: platform
98+
shell: bash
99+
env:
100+
WORKFLOW_CHANGED: ${{ steps.workflow.outputs.any_changed }}
101+
run: |
102+
if [[ "$GITHUB_EVENT_NAME" == pull_request && "$WORKFLOW_CHANGED" != 'true' ]]; then
103+
( echo archs='["amd64"]'
104+
echo oses='["linux"]' ) >> "$GITHUB_OUTPUT"
105+
exit 0
106+
fi
107+
( echo archs='["amd64", "arm64"]'
82108
echo oses='["linux", "windows"]'
83109
) >> "$GITHUB_OUTPUT"
84110
85-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
86-
if: github.event_name == 'pull_request'
87-
- id: changed
88-
if: github.event_name == 'pull_request'
89-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c
90-
with:
91-
files: |
92-
.github/workflows/release.yml
93-
justfile
94-
Cargo.toml
95-
96111
outputs:
97-
archs: ${{ steps.meta.outputs.archs }}
98-
oses: ${{ steps.meta.outputs.oses }}
99-
version: ${{ steps.meta.outputs.version }}
100-
package: ${{ github.event_name == 'workflow_dispatch' || steps.changed.outputs.any_changed == 'true' }}
112+
archs: ${{ steps.platform.outputs.archs }}
113+
oses: ${{ steps.platform.outputs.oses }}
114+
version: ${{ steps.version.outputs.version }}
115+
package: ${{ github.event_name == 'workflow_dispatch' || steps.build.outputs.any_changed == 'true' || steps.workflow.outputs.any_changed == 'true' }}
101116
profile: ${{ inputs.profile || 'release' }}
102117
publish: ${{ inputs.publish }}
103118
ref: ${{ inputs.ref || github.sha }}
104-
tag: "${{ inputs.tag-prefix || 'release/' }}v${{ steps.meta.outputs.version }}"
119+
tag: "${{ inputs.tag-prefix || 'release/' }}v${{ steps.version.outputs.version }}"
105120
prerelease: ${{ inputs.prerelease }}
106121
draft: ${{ inputs.draft }}
107122
latest: ${{ inputs.latest }}
@@ -134,31 +149,33 @@ jobs:
134149
exclude:
135150
- os: windows
136151
arch: arm64
137-
- os: windows
138-
arch: arm
139152

140153
# If we're not actually building on a release tag, don't short-circuit on
141154
# errors. This helps us know whether a failure is platform-specific.
142155
continue-on-error: ${{ needs.meta.outputs.publish != 'true' }}
143156
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
144157
timeout-minutes: 40
145-
container: docker://ghcr.io/linkerd/dev:v46-rust-musl
158+
container: docker://ghcr.io/linkerd/dev:v47-rust-musl
146159
env:
147160
LINKERD2_PROXY_VENDOR: ${{ github.repository_owner }}
148161
LINKERD2_PROXY_VERSION: ${{ needs.meta.outputs.version }}
149162
steps:
150163
# TODO: add to dev image
151164
- name: Install MiniGW
152165
if: matrix.os == 'windows'
153-
run: apt-get update && apt-get install mingw-w64 -y
166+
run: apt-get update && apt-get install -y mingw-w64
167+
- name: Install cross compilation toolchain
168+
if: matrix.arch == 'arm64'
169+
run: apt-get update && apt-get install -y binutils-aarch64-linux-gnu
170+
154171
- name: Configure git
155172
run: git config --global --add safe.directory "$PWD" # actions/runner#2033
156-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
173+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
157174
with:
158175
ref: ${{ needs.meta.outputs.ref }}
159176
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0
160177
with:
161-
key: ${{ matrix.arch }}
178+
key: ${{ matrix.os }}-${{ matrix.arch }}
162179
- run: just fetch
163180
- run: just arch=${{ matrix.arch }} libc=${{ matrix.libc }} os=${{ matrix.os }} rustup
164181
- run: just arch=${{ matrix.arch }} libc=${{ matrix.libc }} os=${{ matrix.os }} profile=${{ needs.meta.outputs.profile }} build
@@ -187,7 +204,7 @@ jobs:
187204
git config --global user.name "$GITHUB_USERNAME"
188205
git config --global user.email "$GITHUB_USERNAME"@users.noreply.github.com
189206
# Tag the release.
190-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
207+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
191208
with:
192209
token: ${{ secrets.LINKERD2_PROXY_GITHUB_TOKEN || github.token }}
193210
ref: ${{ needs.meta.outputs.ref }}

‎.github/workflows/shellcheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
timeout-minutes: 5
1616
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1717
steps:
18-
- uses: linkerd/dev/actions/setup-tools@v46
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
18+
- uses: linkerd/dev/actions/setup-tools@v47
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2020
- run: just sh-lint

0 commit comments

Comments
 (0)