Configure RUSTFLAGS via justfile

olix0r · Dec 10, 2023 · d047a99 · d047a99
1 parent 15f3eda
commit d047a99
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml
@@ -35,9 +35,6 @@ jobs:
           - "1.73"
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    env:
-      RUSTFLAGS: '--cfg tokio_unstable'
-      RUSTDOCFLAGS: '--cfg tokio_unstable'
     steps:
       - uses: linkerd/dev/actions/setup-tools@v42
       - uses: linkerd/dev/actions/setup-rust@v42
@@ -71,9 +68,6 @@ jobs:
           - "server openssl-tls"
           - "server openssl-tls rustls-tls"
           - shutdown
-    env:
-      RUSTFLAGS: '--cfg tokio_unstable'
-      RUSTDOCFLAGS: '--cfg tokio_unstable'
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container: ghcr.io/linkerd/dev:v42-rust

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -38,9 +38,6 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container: ghcr.io/linkerd/dev:v42-rust
-    env:
-      RUSTFLAGS: '--cfg tokio_unstable'
-      RUSTDOCFLAGS: '--cfg tokio_unstable'
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just fetch

diff --git a/.github/workflows/release-prometheus-tokio.yml b/.github/workflows/release-prometheus-tokio.yml
@@ -76,6 +76,9 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container: ghcr.io/linkerd/dev:v42-rust
+    env:
+      RUSTFLAGS: '--cfg tokio_unstable'
+      RUSTDOCFLAGS: '--cfg tokio_unstable'
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: cargo publish --package=kubert-prometheus-tokio --dry-run

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,6 +76,9 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container: ghcr.io/linkerd/dev:v42-rust
+    env:
+      RUSTFLAGS: '--cfg tokio_unstable'
+      RUSTDOCFLAGS: '--cfg tokio_unstable'
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: cargo publish --package=kubert --dry-run

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,9 +31,6 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container: ghcr.io/linkerd/dev:v42-rust
-    env:
-      RUSTFLAGS: '--cfg tokio_unstable'
-      RUSTDOCFLAGS: '--cfg tokio_unstable'
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just fetch

diff --git a/examples/Dockerfile b/examples/Dockerfile
@@ -4,6 +4,7 @@ COPY . .
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     CARGO_NET_RETRY=10 just-cargo fetch
 ARG FEATURES="rustls-tls"
+ENV RUSTFLAGS="--cfg tokio_unstable"
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     CARGO_INCREMENTAL=0 just-cargo build \
     --frozen --package=kubert-examples --examples \

diff --git a/justfile b/justfile
@@ -12,6 +12,7 @@ export CXX := 'clang++-14'
 
 # Enable tokio-metrics
 export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '--cfg tokio_unstable')
+export RUSTDOCFLAGS := env_var_or_default('RUSTDOCFLAGS', '--cfg tokio_unstable')
 
 #
 # Recipes