diff options
| -rw-r--r-- | .github/workflows/android-app.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/verify-locked-down-signatures.yml | 6 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rwxr-xr-x | ci/buildserver-build-android.sh | 2 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 2 | ||||
| -rwxr-xr-x | ci/verify-locked-down-signatures.sh | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 19f69c5fae..0bda8348f3 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -23,9 +23,9 @@ on: description: Override container image type: string required: false - # Build if master is updated to ensure up-to-date caches are available + # Build if main is updated to ensure up-to-date caches are available push: - branches: [master] + branches: [main] jobs: prepare: name: Prepare diff --git a/.github/workflows/verify-locked-down-signatures.yml b/.github/workflows/verify-locked-down-signatures.yml index cf4657a479..0e4f281a51 100644 --- a/.github/workflows/verify-locked-down-signatures.yml +++ b/.github/workflows/verify-locked-down-signatures.yml @@ -29,8 +29,8 @@ jobs: run: |- commits=${{ github.event.pull_request.commits }} if [[ -n "$commits" ]]; then - # Prepare enough depth for diffs with master, currently hard-coded but should probably be + # Prepare enough depth for diffs with main, currently hard-coded but should probably be # whatever branch is merged into - git fetch --depth="$(( commits + 1 ))" origin ${{ github.head_ref }} master + git fetch --depth="$(( commits + 1 ))" origin ${{ github.head_ref }} main fi - ci/verify-locked-down-signatures.sh --import-gpg-keys --whitelist origin/master + ci/verify-locked-down-signatures.sh --import-gpg-keys --whitelist origin/main @@ -48,8 +48,8 @@ in other DEs, but we don't regularly test those. ## Features -Here is a table containing the features of the app across platforms. This reflects the current -state of latest master, not necessarily any existing release. +Here is a table containing the features of the app across platforms. This is intended to reflect +the current state of the latest code in git, not necessarily any existing release. | | Windows | Linux | macOS | Android | iOS | |-------------------------------|:-------:|:-----:|:-----:|:-------:|:---:| @@ -84,7 +84,7 @@ cd mullvadvpn-app git submodule update --init ``` -We sign every commit on the master branch as well as our release tags. If you would like to verify +We sign every commit on the `main` branch as well as our release tags. If you would like to verify your checkout, you can find our developer keys on [Mullvad's Open Source page]. ### Binaries submodule diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index bdb1e94164..6e04bf18b9 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -15,7 +15,7 @@ LAST_BUILT_DIR="$SCRIPT_DIR/last-built" UPLOAD_DIR="$SCRIPT_DIR/upload" ANDROID_CREDENTIALS_DIR="$SCRIPT_DIR/credentials-android" -BRANCHES_TO_BUILD=("origin/master") +BRANCHES_TO_BUILD=("origin/main") TAG_PATTERN_TO_BUILD=("^android/") upload() { diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 80a69dc49f..73859b7704 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -19,7 +19,7 @@ BUILD_DIR="$SCRIPT_DIR/mullvadvpn-app" LAST_BUILT_DIR="$SCRIPT_DIR/last-built" UPLOAD_DIR="/home/upload/upload" -BRANCHES_TO_BUILD=("origin/master") +BRANCHES_TO_BUILD=("origin/main") case "$(uname -s)" in Darwin*|MINGW*|MSYS_NT*) diff --git a/ci/verify-locked-down-signatures.sh b/ci/verify-locked-down-signatures.sh index 7ffdfc902d..638e9d0831 100755 --- a/ci/verify-locked-down-signatures.sh +++ b/ci/verify-locked-down-signatures.sh @@ -12,7 +12,7 @@ import_gpg_keys="false" # The policy of enforcing lockfiles to be signed was not in place before this commit and # as such some of the commits before are not signed # The whitelisted commit can be set in order to allow github actions to only check changes -# since origin/master +# since origin/main whitelisted_commit="618130520" while [ "$#" -gt 0 ]; do |