diff options
| author | Linus Färnstrand <faern@faern.net> | 2021-12-30 10:59:05 +0100 |
|---|---|---|
| committer | Linus Färnstrand <faern@faern.net> | 2021-12-30 10:59:05 +0100 |
| commit | d4d31a46fc7ef570e78499c899366f9149bd0feb (patch) | |
| tree | 6bda084d0cb5787531054e2e5b34cc21ff8c25f1 | |
| parent | ec76782ec5a3bab8c9036fb6b8b1239b548317c4 (diff) | |
| download | mullvadvpn-d4d31a46fc7ef570e78499c899366f9149bd0feb.tar.xz mullvadvpn-d4d31a46fc7ef570e78499c899366f9149bd0feb.zip | |
Make build-apk.sh use cargo run directly to get relay list etc
| -rw-r--r-- | .github/workflows/daemon.yml | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 6 | ||||
| -rwxr-xr-x | update-api-address.sh | 6 | ||||
| -rwxr-xr-x | update-relays.sh | 6 |
4 files changed, 4 insertions, 16 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index 49c983c259..7c89429530 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -29,8 +29,6 @@ on: - integration-tests.sh - prepare-release.sh - rustfmt.toml - - update-api-address.sh - - update-relays.sh - version-metadata.sh # Build if requested manually from the Actions tab workflow_dispatch: diff --git a/build-apk.sh b/build-apk.sh index 50cb516c6b..35c340194a 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -126,8 +126,10 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do $STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" done -./update-relays.sh -./update-api-address.sh +echo "Updating relays.json..." +cargo run --bin relay_list $CARGO_ARGS > dist-assets/relays.json +echo "Updating api-ip-address..." +cargo run --bin address_cache $CARGO_ARGS > dist-assets/api-ip-address.txt cd "$SCRIPT_DIR/android" $GRADLE_CMD --console plain "$GRADLE_TASK" diff --git a/update-api-address.sh b/update-api-address.sh deleted file mode 100755 index e0e27a5d21..0000000000 --- a/update-api-address.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -echo "Updating API address cache..." -set -e - -cargo run --bin address_cache --release > dist-assets/api-ip-address.txt diff --git a/update-relays.sh b/update-relays.sh deleted file mode 100755 index 78f693750f..0000000000 --- a/update-relays.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -echo "Updating relay list..." -set -e - -cargo run --bin relay_list --release > dist-assets/relays.json |