From d9e33d025151ee02eb5e4100d50813b43599fb05 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@signal.org>
Date: Mon, 9 Nov 2020 12:36:15 -0500
Subject: [PATCH] Pin nightly to a specific date

---
 .github/workflows/java.yml  | 8 +++-----
 .github/workflows/rust.yml  | 5 ++---
 .github/workflows/swift.yml | 8 +++-----
 java/Dockerfile             | 6 +++---
 rust-toolchain              | 2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 3898f9e4e..af767473c 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install nightly rust
+    - uses: actions/checkout@v2
+
+    - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
-        override: true
         profile: minimal
 
     - name: Install Android toolchains
@@ -29,8 +29,6 @@ jobs:
     - name: Install NDK tool
       run: cargo install cargo-ndk
 
-    - uses: actions/checkout@v2
-
     - name: Build libsignal-client-java
       run: ./gradlew build
       working-directory: java
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d5a61bbcd..c30660def 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -16,14 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install nightly rust
+    - uses: actions/checkout@v2
+    - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
         override: true
         profile: minimal
         components: rustfmt, clippy
-    - uses: actions/checkout@v2
     - name: Check for duplicate dependencies
       run: |
         DUPS=$(cargo tree -d -e normal)
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 715e4c4f1..215936915 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -16,15 +16,13 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-    - name: Install nightly rust
+    - uses: actions/checkout@v2
+
+    - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
-        override: true
         profile: minimal
 
-    - uses: actions/checkout@v2
-
     - name: Build libsignal-ffi
       run: cargo build --verbose -p libsignal-ffi
 
diff --git a/java/Dockerfile b/java/Dockerfile
index 4dffd0961..a34825566 100644
--- a/java/Dockerfile
+++ b/java/Dockerfile
@@ -53,7 +53,9 @@ RUN    echo y | ./android-sdk/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "p
     && ./android-sdk/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "ndk;${NDK_VERSION}"
 
 # Rust setup...
-ARG RUST_TOOLCHAIN=nightly-2020-11-01
+
+# This should always match the version set in rust-toolchain
+ARG RUST_TOOLCHAIN=nightly-2020-11-09
 ARG RUSTUP_SHA=ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b
 ARG CARGO_NDK_VERSION=1.0.0
 ENV PATH="/home/libsignal/.cargo/bin:${PATH}"
@@ -72,8 +74,6 @@ COPY   java/gradle gradle
 COPY   java/gradlew gradlew
 RUN    ./gradlew --version
 
-RUN    echo "${RUST_TOOLCHAIN}" > rust-toolchain
-
 # Convert ssh to https for git dependency access without a key.
 RUN    git config --global url."https://github".insteadOf ssh://git@github
 
diff --git a/rust-toolchain b/rust-toolchain
index bf867e0ae..05ae6e228 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2020-11-09