diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-02-23 10:56:43 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-02-23 12:01:58 +0100 |
| commit | a0d5aa28ad71e340bfa002c83285235ec74cea68 (patch) | |
| tree | 5a4dbd2e244f3bdd1af213a1821084918d602a24 /ci | |
| parent | 36ed8a2e8a80467dd801f18fdb9cfccae121628e (diff) | |
| download | mullvadvpn-a0d5aa28ad71e340bfa002c83285235ec74cea68.tar.xz mullvadvpn-a0d5aa28ad71e340bfa002c83285235ec74cea68.zip | |
Rename all mentions of the "master" branch to "main"
Diffstat (limited to 'ci')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 |