Skip to content

Commit 3ef9434

Browse files
alpebalpeb
committed
testing dev:50
1 parent c35aeff commit 3ef9434

8 files changed

Lines changed: 19 additions & 35 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linkerd2",
3-
"image": "ghcr.io/linkerd/dev:v49",
3+
"image": "ghcr.io/alpeb/dev:v50",
44
// "dockerFile": "./Dockerfile",
55
// "context": "..",
66
"features": {

‎.github/workflows/actions.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: Actions
22

3-
on:
4-
pull_request:
5-
paths:
6-
- .devcontainer/devcontainer.json
7-
- .github/workflows/**
3+
on: pull_request
84

95
permissions:
106
contents: read
@@ -14,13 +10,13 @@ jobs:
1410
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1511
timeout-minutes: 10
1612
steps:
17-
- uses: linkerd/dev/actions/setup-tools@v49
13+
- uses: alpeb/dev/actions/setup-tools@v50
1814
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
1915
- run: just-dev lint-actions
2016

2117
devcontainer-versions:
2218
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
2319
steps:
24-
- uses: linkerd/dev/actions/setup-tools@v49
20+
- uses: alpeb/dev/actions/setup-tools@v50
2521
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
2622
- run: just-dev check-action-images

‎.github/workflows/devcontainer.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,15 @@ name: Devcontainer
22

33
# When a pull request is opened that changes the Devcontainer configuration,
44
# ensure that the container continues to build properly.
5-
on:
6-
pull_request:
7-
paths:
8-
- .devcontainer/devcontainer.json
9-
- .github/workflows/devcontainer.yml
10-
- rust-toolchain
5+
on: pull_request
116

127
permissions:
138
contents: read
149

1510
jobs:
1611
rust-version:
1712
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
18-
container: ghcr.io/linkerd/dev:v49-rust
13+
container: ghcr.io/alpeb/dev:v50-rust
1914
steps:
2015
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
2116
- shell: bash
@@ -39,6 +34,6 @@ jobs:
3934
devcontainer-image:
4035
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
4136
steps:
42-
- uses: linkerd/dev/actions/setup-tools@v49
37+
- uses: alpeb/dev/actions/setup-tools@v50
4338
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
4439
- run: just-dev pull-dev-image

‎.github/workflows/go.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ jobs:
2929
if: needs.meta.outputs.changed == 'true'
3030
timeout-minutes: 10
3131
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
32-
container: ghcr.io/linkerd/dev:v49-go
32+
container: ghcr.io/alpeb/dev:v50-go
3333
steps:
3434
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
3535
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16
3636
with:
3737
go-version-file: go.mod
38-
- uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee
3938
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
4039
- run: just go-lint --verbose --timeout=10m
4140

@@ -44,7 +43,7 @@ jobs:
4443
if: needs.meta.outputs.changed == 'true'
4544
timeout-minutes: 10
4645
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
47-
container: ghcr.io/linkerd/dev:v49-go
46+
container: ghcr.io/alpeb/dev:v50-go
4847
steps:
4948
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
5049
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16
@@ -58,7 +57,7 @@ jobs:
5857
if: needs.meta.outputs.changed == 'true'
5958
timeout-minutes: 30
6059
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
61-
container: ghcr.io/linkerd/dev:v49-go
60+
container: ghcr.io/alpeb/dev:v50-go
6261
steps:
6362
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
6463
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16

‎.github/workflows/proto.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Proto
22

3-
on:
4-
pull_request:
5-
paths:
6-
- .github/workflows/proto.yml
7-
- bin/protoc*
8-
- "**/*.proto"
9-
- "**/gen/**/*.go"
3+
on: pull_request
104

115
permissions:
126
contents: read
@@ -15,7 +9,7 @@ jobs:
159
proto-diff:
1610
timeout-minutes: 10
1711
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
18-
container: ghcr.io/linkerd/dev:v49-go
12+
container: ghcr.io/alpeb/dev:v50-go
1913
steps:
2014
- run: apt update && apt install -y unzip
2115
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10

‎.github/workflows/rust.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
audit:
2828
timeout-minutes: 10
2929
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
30-
container: ghcr.io/linkerd/dev:v49-rust
30+
container: ghcr.io/alpeb/dev:v50-rust
3131
strategy:
3232
matrix:
3333
checks:
@@ -43,7 +43,7 @@ jobs:
4343
fmt:
4444
timeout-minutes: 5
4545
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
46-
container: ghcr.io/linkerd/dev:v49-rust
46+
container: ghcr.io/alpeb/dev:v50-rust
4747
steps:
4848
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
4949
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -52,7 +52,7 @@ jobs:
5252
clippy:
5353
timeout-minutes: 20
5454
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
55-
container: ghcr.io/linkerd/dev:v49-rust
55+
container: ghcr.io/alpeb/dev:v50-rust
5656
steps:
5757
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
5858
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -63,7 +63,7 @@ jobs:
6363
check:
6464
timeout-minutes: 20
6565
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
66-
container: ghcr.io/linkerd/dev:v49-rust
66+
container: ghcr.io/alpeb/dev:v50-rust
6767
steps:
6868
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
6969
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -74,7 +74,7 @@ jobs:
7474
name: test
7575
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
7676
timeout-minutes: 15
77-
container: ghcr.io/linkerd/dev:v49-rust
77+
container: ghcr.io/alpeb/dev:v50-rust
7878
steps:
7979
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
8080
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033

‎.github/workflows/shell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
timeout-minutes: 10
1717
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1818
steps:
19-
- uses: linkerd/dev/actions/setup-tools@v49
19+
- uses: alpeb/dev/actions/setup-tools@v50
2020
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
2121
- run: just sh-lint

‎Dockerfile.controller‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COPY multicluster multicluster
2121
ARG TARGETARCH
2222
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/controller -tags prod -mod=readonly -ldflags "-s -w" ./controller/cmd
2323

24-
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v49-rust-musl AS policy
24+
FROM --platform=$BUILDPLATFORM ghcr.io/alpeb/dev:v50-rust-musl AS policy
2525
ARG BUILD_TYPE="release"
2626
WORKDIR /build
2727
RUN mkdir -p target/bin

0 commit comments

Comments
 (0)