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 /.github | |
| parent | 36ed8a2e8a80467dd801f18fdb9cfccae121628e (diff) | |
| download | mullvadvpn-a0d5aa28ad71e340bfa002c83285235ec74cea68.tar.xz mullvadvpn-a0d5aa28ad71e340bfa002c83285235ec74cea68.zip | |
Rename all mentions of the "master" branch to "main"
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-app.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/verify-locked-down-signatures.yml | 6 |
2 files changed, 5 insertions, 5 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 |