diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2025-02-07 13:32:59 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2025-02-07 13:34:29 +0100 |
| commit | 87cd146b40b38d750312d7ca265bc07a56559301 (patch) | |
| tree | 623fc9e597c5b0d5ca4cb3f7d909f0a84fb1be60 | |
| parent | 4c688c899d3094c0d703489fdbac7dc1c1a9408d (diff) | |
| download | mullvadvpn-87cd146b40b38d750312d7ca265bc07a56559301.tar.xz mullvadvpn-87cd146b40b38d750312d7ca265bc07a56559301.zip | |
Update all CI to update wireguard-go submodule more explicitly
| -rw-r--r-- | .github/workflows/android-app.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/clippy.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/daemon.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/desktop-e2e.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 6 | ||||
| -rw-r--r-- | android/BuildInstructions.md | 2 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 2 | ||||
| -rwxr-xr-x | ci/buildserver-build-android.sh | 2 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index fab337c71e..cf6ec32518 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -120,7 +120,7 @@ jobs: - name: Checkout wireguard-go-rs recursively run: | git config --global --add safe.directory '*' - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Calculate native lib cache hash id: native-lib-cache-hash diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 218eeeef23..cacb0236cb 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -48,7 +48,7 @@ jobs: - name: Checkout submodules run: | git submodule update --init --depth=1 dist-assets/binaries - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install build dependencies if: matrix.os == 'ubuntu-latest' @@ -99,7 +99,7 @@ jobs: - name: Checkout wireguard-go submodule run: | git config --global --add safe.directory '*' - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Clippy check env: diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index 8e22397b9c..7bf893d1ea 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -77,7 +77,7 @@ jobs: run: | git config --global --add safe.directory '*' git submodule update --init --depth=1 dist-assets/binaries - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go # The container image already has rustup and the pinned version of Rust - name: Install Rust toolchain @@ -100,7 +100,7 @@ jobs: - name: Checkout wireguard-go submodule run: | git config --global --add safe.directory '*' - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install Protoc uses: arduino/setup-protoc@v3 @@ -131,7 +131,7 @@ jobs: - name: Checkout submodules run: | git submodule update --init --depth=1 - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install Protoc # NOTE: ARM runner already has protoc diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml index a44905e55f..2165308d76 100644 --- a/.github/workflows/desktop-e2e.yml +++ b/.github/workflows/desktop-e2e.yml @@ -124,7 +124,7 @@ jobs: run: | git config --global --add safe.directory '*' git submodule update --init --depth=1 dist-assets/binaries - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Build app env: USE_MOLD: false @@ -187,7 +187,7 @@ jobs: submodules: true - name: Checkout submodules run: | - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install Protoc uses: arduino/setup-protoc@v3 with: @@ -274,7 +274,7 @@ jobs: - name: Checkout submodules run: | git config --global --add safe.directory '*' - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install Go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index aed6d4ea22..47c58bcca2 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -48,7 +48,7 @@ jobs: run: | git config --global --add safe.directory '*' git submodule update --init --depth=1 dist-assets/binaries - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install nightly Rust toolchain run: rustup override set $RUST_NIGHTLY_TOOLCHAIN @@ -79,7 +79,7 @@ jobs: - name: Checkout wireguard-go submodule run: | git config --global --add safe.directory '*' - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install nightly Rust run: | @@ -106,7 +106,7 @@ jobs: run: | git config --global --add safe.directory '*' git submodule update --init --depth=1 - git submodule update --init --recursive --depth=1 wireguard-go-rs + git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install msbuild if: matrix.os == 'windows-latest' diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md index 8c63957847..5755737df8 100644 --- a/android/BuildInstructions.md +++ b/android/BuildInstructions.md @@ -155,7 +155,7 @@ environment variables: ``` #### 6. Download wireguard-go-rs submodule -Run the following command to download wireguard-go-rs submodule: `git submodule update --init --recursive --depth=1 wireguard-go-rs` +Run the following command to download wireguard-go-rs submodule: `git submodule update --init wireguard-go-rs/libwg/wireguard-go` ### Debug build Run the following command to build a debug build: diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md index 18feb1b4cb..4ef004d595 100644 --- a/android/docs/BuildInstructions.macos.md +++ b/android/docs/BuildInstructions.macos.md @@ -65,7 +65,7 @@ export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/x86_64-linux wireguard-go-rs submodule need to be downloaded: ```bash -git submodule update --init --recursive --depth=1 wireguard-go-rs +git submodule update --init wireguard-go-rs/libwg/wireguard-go ``` ## 4. Debug build diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index 0010161ead..a2eb39a112 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -65,7 +65,7 @@ function checkout_ref { git reset --hard git checkout "$ref" git submodule update - git submodule update --init --recursive --depth=1 wireguard-go-rs || true + git submodule update --init wireguard-go-rs/libwg/wireguard-go || true git clean -df } diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index b68bd79e77..d932f6825d 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -159,7 +159,7 @@ function checkout_ref { git reset --hard git checkout "$ref" git submodule update - git submodule update --init --recursive --depth=1 wireguard-go-rs || true + git submodule update --init wireguard-go-rs/libwg/wireguard-go || true git clean -df } |
