diff options
| author | Albin <albin@mullvad.net> | 2022-04-29 11:22:59 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-04-29 11:22:59 +0200 |
| commit | 527d55cef58ec39b6ab36e4d6ecd7bd89fdb692f (patch) | |
| tree | 3fc013ed4207105fd584083507a7e7618970713f | |
| parent | 2028e5b78ddc90d8d1df7e9ac830346cf912388a (diff) | |
| parent | e7784690b3c5bfbee4a846ccc1ecb882ed5a6872 (diff) | |
| download | mullvadvpn-527d55cef58ec39b6ab36e4d6ecd7bd89fdb692f.tar.xz mullvadvpn-527d55cef58ec39b6ab36e4d6ecd7bd89fdb692f.zip | |
Merge branch 'switch-rust-toolchain-action'
| -rw-r--r-- | .github/workflows/android-app.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/daemon.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/rustfmt.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/translations-converter.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/translations.yml | 5 |
5 files changed, 20 insertions, 13 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 880d877626..00161fecd9 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -49,10 +49,11 @@ jobs: - name: Configure Rust if: steps.cache-native-libs.outputs.cache-hit != 'true' - uses: actions-rs/toolchain@v1 + uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable target: x86_64-linux-android + default: true - name: Configure Go if: steps.cache-native-libs.outputs.cache-hit != 'true' diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index d5b8e88efd..f34a700da7 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -48,9 +48,10 @@ jobs: run: git submodule update --init --depth=1 dist-assets/binaries - name: Install Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: ${{ matrix.rust }} + toolchain: ${{ matrix.rust }} + default: true - name: Install Go uses: actions/setup-go@v2.1.3 @@ -70,9 +71,10 @@ jobs: uses: actions/checkout@v2 - name: Install Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + default: true - name: Install Go uses: actions/setup-go@v2.1.3 @@ -111,9 +113,10 @@ jobs: key: windows-modules-${{ steps.windows-modules-hash.outputs.hash }} - name: Install Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + default: true - name: Install Go uses: actions/setup-go@v2.1.3 diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index c381337e5a..f8100d585f 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -16,10 +16,11 @@ jobs: uses: actions/checkout@v2 - name: Install nightly Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: nightly + toolchain: nightly components: rustfmt + default: true - name: Check formatting run: | diff --git a/.github/workflows/translations-converter.yml b/.github/workflows/translations-converter.yml index 9b1f518864..f6440a4c69 100644 --- a/.github/workflows/translations-converter.yml +++ b/.github/workflows/translations-converter.yml @@ -15,9 +15,10 @@ jobs: uses: actions/checkout@v2 - name: Install Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + default: true - name: Build and test translations converter tool working-directory: android/translations-converter diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 08a0cf91b2..67ba56c6ac 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -36,9 +36,10 @@ jobs: run: npm ci - name: Install nightly Rust - uses: ATiltedTree/setup-rust@v1.0.4 + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + default: true - name: Extract messages from desktop GUI working-directory: gui/locales |