diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-03-03 10:22:34 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-03-03 10:22:34 +0100 |
| commit | f46a620518313cc47e2fd021abc93ea9cf556b32 (patch) | |
| tree | 91378e3623569afacedb6e9eef5733f971631f3f | |
| parent | ec8fc5a6f70243d11f5d20a8d2ba0a0b1f476ed8 (diff) | |
| parent | a91426f8842a0fff0fb6c4a1eb0e16df2c240249 (diff) | |
| download | mullvadvpn-f46a620518313cc47e2fd021abc93ea9cf556b32.tar.xz mullvadvpn-f46a620518313cc47e2fd021abc93ea9cf556b32.zip | |
Merge branch 'bump-linux-container-image'
| -rw-r--r-- | .github/workflows/daemon.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 5 | ||||
| -rw-r--r-- | building/linux-container-image.txt | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index 2300169679..6e054dbd0d 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -69,7 +69,9 @@ jobs: uses: actions/checkout@v3 - name: Checkout binaries submodule - run: git submodule update --init --depth=1 dist-assets/binaries + run: | + git config --global --add safe.directory '*' + git submodule update --init --depth=1 dist-assets/binaries # The container image already has rustup and Rust, but only the stable toolchain - name: Install Rust toolchain diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index b59720b244..e8d708667f 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -6,6 +6,7 @@ on: - .github/workflows/rust-unused-dependencies.yml - '**/*.rs' - '**/Cargo.toml' + - 'building/*-container-image.txt' workflow_dispatch: env: RUST_NIGHTLY_TOOLCHAIN: nightly-2023-01-13 @@ -40,7 +41,9 @@ jobs: uses: actions/checkout@v3 - name: Checkout binaries submodule - run: git submodule update --init --depth=1 dist-assets/binaries + run: | + git config --global --add safe.directory '*' + git submodule update --init --depth=1 dist-assets/binaries - name: Install nightly Rust toolchain run: rustup default $RUST_NIGHTLY_TOOLCHAIN diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt index 92eaa86c59..430c5b568b 100644 --- a/building/linux-container-image.txt +++ b/building/linux-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build:62371bb6c +ghcr.io/mullvad/mullvadvpn-app-build:20d7550f1 |