Pin nightly compiler to 2022-09-13 (metalbear-co#423)

DmitryDodzin · Sep 15, 2022 · 77e98e6 · 77e98e6
1 parent eb63359
commit 77e98e6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -5,4 +5,4 @@ ARG VARIANT="buster"
 FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT}
 
 RUN apt update && apt install -y libpcap-dev cmake clang
-RUN rustup toolchain install nightly-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-x86_64-unknown-linux-gnu
+RUN rustup toolchain install nightly-2022-09-13-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2022-09-13-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2022-09-13-x86_64-unknown-linux-gnu
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           components: rustfmt, clippy
       - uses: Swatinem/rust-cache@v1
       # Needed for agent
@@ -33,7 +33,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           target: ${{matrix.target}}
       - uses: Swatinem/rust-cache@v1
         with:
@@ -48,11 +48,11 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           components: rustfmt
       - uses: Swatinem/rust-cache@v1
       - run: sudo apt install -y libpcap-dev cmake
-      - run: sudo PATH=/home/runner/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:/usr/bin:/usr/sbin /home/runner/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/cargo test -p mirrord-agent
+      - run: sudo PATH=/home/runner/.rustup/toolchains/nightly-2022-09-13-x86_64-unknown-linux-gnu/bin:/usr/bin:/usr/sbin /home/runner/.rustup/toolchains/nightly-2022-09-13-x86_64-unknown-linux-gnu/bin/cargo test -p mirrord-agent
 
   test_agent_image:
     runs-on: ubuntu-latest
@@ -97,13 +97,13 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           target: ${{matrix.target}}
       - uses: Swatinem/rust-cache@v1
         with:
           key: ${{matrix.os}}-${{matrix.target}}
       # For now, just verify it compiles.
-      - run: cargo +nightly build -p mirrord-layer -p mirrord --target=${{matrix.target}}
+      - run: cargo +nightly-2022-09-13 build -p mirrord-layer -p mirrord --target=${{matrix.target}}
 
   build_mirrord:
     runs-on: ubuntu-latest
@@ -113,13 +113,13 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           components: rustfmt
       - uses: Swatinem/rust-cache@v1
         with:
           key: ubuntu-latest
       - run: sudo apt install -y libpcap-dev cmake
-      - run: cargo +nightly build --manifest-path=./Cargo.toml
+      - run: cargo +nightly-2022-09-13 build --manifest-path=./Cargo.toml
 
   e2e:
     runs-on: ubuntu-latest
@@ -132,7 +132,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           components: rustfmt
       - uses: Swatinem/rust-cache@v1
         with:
@@ -216,7 +216,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           components: rustfmt
       - uses: Swatinem/rust-cache@v1
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,13 +18,13 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           target: ${{matrix.target}}
       - uses: Swatinem/rust-cache@v1
         with:
           key: ${{matrix.target}}-${{matrix.os}}
       - name: build mirrord-layer and cli
-        run: cargo +nightly build --release -p mirrord -p mirrord-layer --target=${{matrix.target}}
+        run: cargo +nightly-2022-09-13 build --release -p mirrord -p mirrord-layer --target=${{matrix.target}}
       - uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.target}}
@@ -39,7 +39,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2022-09-13
           target: aarch64-apple-darwin
       - uses: Swatinem/rust-cache@v1
       - name: Import Code-Signing Certificates
@@ -54,9 +54,9 @@ jobs:
           brew tap mitchellh/gon
           brew install mitchellh/gon/gon
       - name: build mirrord-layer x86-64
-        run: cargo +nightly build --release -p mirrord-layer --target=x86_64-apple-darwin
+        run: cargo +nightly-2022-09-13 build --release -p mirrord-layer --target=x86_64-apple-darwin
       - name: build mirrord-layer macOS arm
-        run: cargo +nightly build --release -p mirrord-layer --target=aarch64-apple-darwin
+        run: cargo +nightly-2022-09-13 build --release -p mirrord-layer --target=aarch64-apple-darwin
       - name: Sign layer binaries
         env:
           AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }}
@@ -74,11 +74,11 @@ jobs:
       - name: build macOS arm cli with universal dylib
         env:
           MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
-        run: cargo +nightly build --release -p mirrord --target=aarch64-apple-darwin
+        run: cargo +nightly-2022-09-13 build --release -p mirrord --target=aarch64-apple-darwin
       - name: build macOS x86-64 cli with universal dylib
         env:
           MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
-        run: cargo +nightly build --release -p mirrord --target=x86_64-apple-darwin
+        run: cargo +nightly-2022-09-13 build --release -p mirrord --target=x86_64-apple-darwin
       - name: Sign cli binaries
         env:
           AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - mirrord-layer: Return errors from agent when `connect` fails back to the hook (previously we were handling these as errors in layer, so `connect` had slightly wrong behavior).
 ### Changed
 - mirrord-layer: Use `tracing::instrument` to improve logs.
+- CI: pin rust nightly channel to 2022-09-13.
+
 ### Added
 - Outgoing UDP test with node. Closes [[#323](https://github.com/metalbear-co/mirrord/issues/323)]
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2022-09-13"