0
0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-19 19:42:19 +02:00

Pin nightly to a specific date

This commit is contained in:
Jack Lloyd 2020-11-09 12:36:15 -05:00
parent cff700585e
commit d9e33d0251
5 changed files with 12 additions and 17 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -1 +1 @@
nightly
nightly-2020-11-09