diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-01-20 11:47:13 +0100 |
|---|---|---|
| committer | Linus Färnstrand <faern@faern.net> | 2023-01-20 13:36:10 +0100 |
| commit | 54895add3bebe02413c15dda5392affbf30affd8 (patch) | |
| tree | ebd16b35ccf809fda2828395cf635d3066a38d05 | |
| parent | 062815df83e04d0560afb52b02a8495102e124f6 (diff) | |
| download | mullvadvpn-54895add3bebe02413c15dda5392affbf30affd8.tar.xz mullvadvpn-54895add3bebe02413c15dda5392affbf30affd8.zip | |
Move dist-assets/relays.json to build/relays.json
| -rw-r--r-- | .github/workflows/android-app.yml | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | android/app/build.gradle.kts | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 2 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 74b915ca68..7d2e0dbd47 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -76,7 +76,7 @@ jobs: with: path: | ./android/app/build/extraJni - ./dist-assets/relays.json + ./build/relays.json ./dist-assets/api-ip-address.txt key: android-native-libs-${{ runner.os }}-x86_64-${{ steps.native-lib-cache-hash.outputs.native_lib_hash}} @@ -94,7 +94,7 @@ jobs: NDK_TOOLCHAIN_STRIP_TOOL="$NDK_TOOLCHAIN_DIR/x86_64-linux-android-strip" ./wireguard/build-wireguard-go.sh --android --no-docker cargo build --target $TARGET --verbose --package mullvad-jni - cargo run --bin relay_list > dist-assets/relays.json + cargo run --bin relay_list > build/relays.json $NDK_TOOLCHAIN_STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" - name: Build Android app diff --git a/.gitignore b/.gitignore index 8fbeebe0f4..98ce309334 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ .idea/ .DS_Store *.log -/dist-assets/relays.json /dist-assets/mullvad /dist-assets/mullvad.exe /dist-assets/mullvad-daemon diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index d267e0cd6a..96f355180f 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -153,7 +153,7 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> { } tasks.register("copyExtraAssets", Copy::class) { - from("$repoRootPath/dist-assets") + from("$repoRootPath/build") include("relays.json") into(extraAssetsDirectory) } diff --git a/build-apk.sh b/build-apk.sh index c781bd7fb0..0088c29346 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -122,7 +122,7 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do done echo "Updating relays.json..." -cargo run --bin relay_list $CARGO_ARGS > dist-assets/relays.json +cargo run --bin relay_list $CARGO_ARGS > build/relays.json cd "$SCRIPT_DIR/android" $GRADLE_CMD --console plain "$GRADLE_TASK" @@ -325,7 +325,7 @@ if [[ "$(uname -s)" == "Darwin" || "$(uname -s)" == "Linux" ]]; then fi log_info "Updating relays.json..." -cargo run --bin relay_list "${CARGO_ARGS[@]}" > dist-assets/relays.json +cargo run --bin relay_list "${CARGO_ARGS[@]}" > build/relays.json log_header "Installing JavaScript dependencies" diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index f36463b391..1f045ba249 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -26,7 +26,7 @@ const config = { compression: noCompression ? 'store' : 'normal', extraResources: [ { from: distAssets('ca.crt'), to: '.' }, - { from: distAssets('relays.json'), to: '.' }, + { from: root('build/relays.json'), to: '.' }, { from: root('CHANGELOG.md'), to: '.' }, ], |