diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-12-05 18:16:52 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-12-05 18:16:52 +0300 |
| commit | 86eec1d558bd631ee9fd8ef8fb30deaf16b159ce (patch) | |
| tree | 92440acf6744a11c6fbc014360442a67a19c9e4a | |
| parent | 26c9608b29bf094cc70baa08945639c8831b9cc7 (diff) | |
| parent | 2ebf0ee09343e78ab98b4763de7aa44993a29c10 (diff) | |
Merge branch 'pks-ci-unbreak-macos-job-on-security-fork' into 'master'
ci: Fix broken macOS jobs on forks of Gitaly
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5130
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be72e22f4..9f290ec43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,6 +133,12 @@ include: expire_in: 1 week .rules_run_on_merge: &rules_run_on_merge + # We only execute these rules in the main Gitaly repository. This is + # because jobs which run conditionally when being merged may depend on + # specific runners that aren't available in any other repository. + - if: $CI_PROJECT_PATH != "gitlab-org/gitaly" + when: manual + allow_failure: true # Automatically run the job when the default branch is changing, e.g. due # to a direct push. - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -306,12 +312,6 @@ test:fips: # There is no Go 1.19 release yet for the FIPS-based images. GO_VERSION: "1.18" rules: - # When running in a fork of Gitaly we don't have the runners available, and - # consequentially this job would fail anyway. So we configure the job to be - # a manual one in that case. - - if: $CI_PROJECT_PATH != "gitlab-org/gitaly" - when: manual - allow_failure: true # Automatically run the job when the FIPS label is set. - if: $CI_MERGE_REQUEST_LABELS =~ /FIPS/ - *rules_run_on_merge |