Skip to content

Commit

Permalink
Update dev to v39 (#216)
Browse files Browse the repository at this point in the history
* Update dev to v39

* Updates Go to v1.19

* Reuse just-cargo in justfile

* remove gross dependency scripts

* fixup
  • Loading branch information
olix0r authored Mar 8, 2023
1 parent 9efe50f commit 5b948f9
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 182 deletions.
38 changes: 21 additions & 17 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
{
"name": "linkerd2-proxy-api",
"image": "ghcr.io/linkerd/dev:v32",
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.go",
"kokakiwi.vscode-just",
"NathanRidley.autotrim",
"rust-lang.rust-analyzer",
"samverschueren.final-newline",
"tamasfe.even-better-toml",
"zxh404.vscode-proto3"
],
"settings": {
"protoc": {
"path": "/usr/local/bin/protoc",
"options": [
"--proto_path=proto",
]
"image": "ghcr.io/linkerd/dev:v39",
"customizations": {
"vscode": {
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.go",
"kokakiwi.vscode-just",
"NathanRidley.autotrim",
"rust-lang.rust-analyzer",
"samverschueren.final-newline",
"tamasfe.even-better-toml",
"zxh404.vscode-proto3"
],
"settings": {
"protoc": {
"path": "/usr/local/bin/protoc",
"options": [
"--proto_path=proto",
]
}
}
}
},
"runArgs": [
Expand Down
25 changes: 4 additions & 21 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,14 @@ jobs:
actionlint:
runs-on: ubuntu-latest
timeout-minutes: 10
container: ghcr.io/linkerd/dev:v32-tools
steps:
- uses: linkerd/dev/actions/setup-tools@v39
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: Run actionlint
run: |
# shellcheck disable=SC2016
actionlint \
-format '{{range $err := .}}::error file={{$err.Filepath}},line={{$err.Line}},col={{$err.Column}}::{{$err.Message}}%0A```%0A{{replace $err.Snippet "\\n" "%0A"}}%0A```\n{{end}}' \
.github/workflows/*
- run: just-dev lint-actions

devcontainer-versions:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v32-tools
steps:
- uses: linkerd/dev/actions/setup-tools@v39
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- name: Scan workflows for other Devcontainer image versions
shell: bash
run: |
set -euo pipefail
image=$(j5j .devcontainer/devcontainer.json |jq -r '.image')
for f in .github/workflows/* ; do
for i in $(yq '.jobs.* | .container.image // .container // "" | match("ghcr.io/linkerd/dev:v[0-9]+").string' < "$f") ; do
if [ "$i" != "$image" ]; then
echo "::error file=$f::Workflow '$f' uses incorrect Devcontainer image '$i'"
exit 1
fi
done
done
- run: just-dev check-action-images
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
go:
timeout-minutes: 5
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-go
container: docker://ghcr.io/linkerd/dev:v39-go
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just go-mod-check
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
test:
timeout-minutes: 5
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just rs-fetch
Expand All @@ -55,7 +55,7 @@ jobs:
contents: write
timeout-minutes: 5
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- if: needs.meta.outputs.publish
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
Expand All @@ -79,7 +79,7 @@ jobs:
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- if: '!needs.meta.outputs.publish'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
gen-check:
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just rs-fetch
Expand All @@ -31,7 +31,7 @@ jobs:
rust-clippy:
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just rs-fetch
Expand All @@ -40,7 +40,7 @@ jobs:
rust-docs:
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just rs-fetch
Expand All @@ -49,7 +49,7 @@ jobs:
rust-test:
timeout-minutes: 10
runs-on: ubuntu-latest
container: docker://ghcr.io/linkerd/dev:v32-rust
container: docker://ghcr.io/linkerd/dev:v39-rust
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- run: just rs-fetch
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/linkerd/linkerd2-proxy-api

go 1.17
go 1.19

require (
github.com/golang/protobuf v1.5.2
Expand Down
8 changes: 7 additions & 1 deletion go/destination/destination.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions go/http_route/http_route.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions go/http_types/http_types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion go/inbound/inbound.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions go/inbound/inbound_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions go/meta/meta.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions go/net/net.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5b948f9

Please sign in to comment.