diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-01-12 14:15:06 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-01-12 14:15:06 +0100 |
| commit | b75b2c8f52c32d95b73584f2dd1fcee6dfc20795 (patch) | |
| tree | 491f2222988da4903ff14018659122d6050a581d /.github/workflows | |
| parent | acb5357702fb6dfd5fc3adbcd4b6a5db4d533c46 (diff) | |
| parent | 57475c156d1eb42ca057925703037c516e1e1771 (diff) | |
| download | mullvadvpn-b75b2c8f52c32d95b73584f2dd1fcee6dfc20795.tar.xz mullvadvpn-b75b2c8f52c32d95b73584f2dd1fcee6dfc20795.zip | |
Merge branch 'run-actions-for-full-prs'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/android-app.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/android-audit.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/android-ktlint.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/android-xml-tidy.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cargo-audit.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/daemon.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/frontend.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/rustfmt.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/translations-converter.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/translations.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/unicode-check.yml | 5 |
12 files changed, 17 insertions, 20 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 14ce293258..367225328c 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -1,7 +1,7 @@ name: Android app CI on: - # Build whenever a file that affects Android is changed by a push - push: + # Build whenever a file that affects Android is changed in a pull request + pull_request: paths: - .github/workflows/android-app.yml - android/** diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml index 4c6c17d006..b73fa2a111 100644 --- a/.github/workflows/android-audit.yml +++ b/.github/workflows/android-audit.yml @@ -1,6 +1,6 @@ name: Android audit on: - push: + pull_request: paths: - .github/workflows/android-audit.yml - android/** diff --git a/.github/workflows/android-ktlint.yml b/.github/workflows/android-ktlint.yml index 6b5c7bbdfd..3f9483f36b 100644 --- a/.github/workflows/android-ktlint.yml +++ b/.github/workflows/android-ktlint.yml @@ -1,7 +1,7 @@ name: Android app Kotlin linter on: # Run linter whenever a Kotlin file changes - push: + pull_request: paths: - .github/workflows/android-ktlint.yml - android/**/*.kt diff --git a/.github/workflows/android-xml-tidy.yml b/.github/workflows/android-xml-tidy.yml index 8cce8aae6d..7b4afd2bfc 100644 --- a/.github/workflows/android-xml-tidy.yml +++ b/.github/workflows/android-xml-tidy.yml @@ -1,7 +1,7 @@ name: Android app XML formatting verifier on: # Run verifier whenever an Android XML file changes - push: + pull_request: paths: - .github/workflows/android-xml-tidy.yml - android/app/src/main/**/*.xml diff --git a/.github/workflows/cargo-audit.yml b/.github/workflows/cargo-audit.yml index 8120c5daf6..be4c168271 100644 --- a/.github/workflows/cargo-audit.yml +++ b/.github/workflows/cargo-audit.yml @@ -1,6 +1,6 @@ name: Audit Rust dependencies CI on: - push: + pull_request: paths: - .github/workflows/cargo-audit.yml - '**/*.rs' diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index 7c89429530..6a2891506b 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -1,7 +1,7 @@ name: Mullvad VPN daemon CI on: - # Build whenever a file that affects a Rust crate is changed by a push - push: + # Build whenever a file that affects a Rust crate is changed in a pull request + pull_request: paths-ignore: - '**/*.md' - .github/workflows/android*.yml diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 0a683bff8b..5d6721a090 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -1,7 +1,7 @@ name: Electron frontend CI on: - # Build whenever a file that affects the frontend is changed by a push - push: + # Build whenever a file that affects the frontend is changed in a pull request + pull_request: paths: - .github/workflows/frontend.yml - gui/** diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 54edb6d955..c9f8ff4fd0 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -1,6 +1,6 @@ name: iOS app CI on: - push: + pull_request: paths: - .github/workflows/ios.yml - ios/** diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml index 3f95dfda3e..900d5ed974 100644 --- a/.github/workflows/rustfmt.yml +++ b/.github/workflows/rustfmt.yml @@ -1,7 +1,7 @@ name: Rust formatting check CI on: - # Check whenever a file that affects Rust formatting is changed by a push - push: + # Check whenever a file that affects Rust formatting is changed in a pull request + pull_request: paths: - .github/workflows/rustfmt.yml - rustfmt.toml diff --git a/.github/workflows/translations-converter.yml b/.github/workflows/translations-converter.yml index d9676f513a..9b1f518864 100644 --- a/.github/workflows/translations-converter.yml +++ b/.github/workflows/translations-converter.yml @@ -1,7 +1,7 @@ name: Translations converter tool CI on: # Run whenever a file that affects the translations converter tool is changed - push: + pull_request: paths: - .github/workflows/translations-converter.yml - android/translations-converter/** diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 537ad375bf..eb263df73b 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -1,7 +1,7 @@ name: Translation check CI on: - # Check whenever a file that affects Rust formatting is changed by a push - push: + # Check whenever a file that affects Rust formatting is changed in a pull request + pull_request: paths: - .github/workflows/translations.yml - android/translations-converter/** diff --git a/.github/workflows/unicode-check.yml b/.github/workflows/unicode-check.yml index 03273bc029..623b34d9e8 100644 --- a/.github/workflows/unicode-check.yml +++ b/.github/workflows/unicode-check.yml @@ -1,8 +1,5 @@ name: Bidirectional Unicode scan -on: - push: - # Request manually from the Actions tab - workflow_dispatch: +on: [pull_request, workflow_dispatch] jobs: build-linux: runs-on: ubuntu-latest |
