v0.2.8 (#412)

* Update dev to v42 with Rust 1.73 * Update tokio to 1.35 * Update hyper to 1.0 * Update http to 1.0
linkerd · Dec 11, 2023 · 8808509 · 8808509
1 parent 5e2186e
commit 8808509
Show file tree

Hide file tree

Showing 11 changed files with 288 additions and 200 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "linkerd-await",
-	"image": "ghcr.io/linkerd/dev:v32",
+	"image": "ghcr.io/linkerd/dev:v42",
 	"extensions": [
 		"DavidAnson.vscode-markdownlint",
 		"kokakiwi.vscode-just",

diff --git a/.github/actions/package/Dockerfile b/.github/actions/package/Dockerfile
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -11,16 +11,18 @@ permissions:
 
 jobs:
   actionlint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 10
-    container: ghcr.io/linkerd/dev:v32-tools
     steps:
+      - uses: linkerd/dev/actions/setup-tools@v42
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
       - run: just actionlint
 
   devcontainer-versions:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v32-tools
     steps:
+      - uses: linkerd/dev/actions/setup-tools@v42
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
       - run: just actions-dev-versions
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -7,9 +7,10 @@ jobs:
   check:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v32-rust
+    container: ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
       - run: just fetch
       - run: just check-fmt
       - run: just clippy

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,6 @@ name: Release
 on:
   pull_request:
     paths:
-      - .github/actions/package/*
       - .github/workflows/release.yml
       - justfile
   push:
@@ -54,20 +53,23 @@ jobs:
     name: Package (${{ matrix.arch }})
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    env:
+      ARCH: ${{ matrix.arch }}
+      PACKAGE_VERSION: ${{ needs.meta.outputs.version }}
+      CARGO_RELEASE: "1"
+      DEBIAN_FRONTEND: noninteractive
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-      - name: package
-        uses: ./.github/actions/package
-        with:
-          entrypoint: just
-          args: release
-        env:
-          CARGO: cross
-          CARGO_RELEASE: "1"
-          CROSS_DOCKER_IN_DOCKER: true
-          PACKAGE_VERSION: ${{ needs.meta.outputs.version }}
-          ARCH: ${{ matrix.arch }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
+      - run: just rustup
+        if: matrix.arch != 'amd64'
+      - run: apt-get update && apt-get install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+        if: matrix.arch == 'arm64'
+      - run: apt-get update && apt-get install -y g++-arm-linux-gnueabihf  gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
+        if: matrix.arch == 'arm'
+      - run: just release
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
         with:
           name: ${{ matrix.arch }}-artifacts
           path: release/*