diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-09 14:48:12 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-14 14:39:36 +0300 |
| commit | cec0b6c02fc9969b90c6536a806f4115d4fb5ac1 (patch) | |
| tree | 4787491a0f915b967f8e996d34153be1b3d6ba79 | |
| parent | 6932571f604131b016571dbc88d6f8de8275ef3a (diff) | |
ci: Split up macOS script by lifecycle
The macOS job is currently executing all steps in the `script` part.
Split it up into `before_script`, `script` and `after_script`. While
this is conceptually cleaner, it also means that the `after_script` will
get executed even if `script` fails to analyze tests for any panics.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a73ec165..53520fe08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -313,7 +313,7 @@ test:macos: needs: [] stage: test image: macos-12-xcode-14 - script: + before_script: - brew uninstall go - brew install cmake go@${GO_VERSION} # Older Go versions may be keg-only and thus aren't linked into `PATH` by @@ -328,7 +328,9 @@ test:macos: - pg_ctl status - createdb -U $PGUSER $POSTGRES_DB - make -j$(nproc) build prepare-tests + script: - make test-go + after_script: - *test_after_script tags: - shared-macos-amd64 |