diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-06 15:07:45 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-06 15:07:45 +0300 |
| commit | 4cfc2985cb5dab908bcf326ed0e6d84d36915f60 (patch) | |
| tree | 4ee41dcc0889ee5f996c30a0f94b60c8fbc4a706 | |
| parent | c0131a7b54def53fdb4f409ae1dc7913c66822f1 (diff) | |
| parent | f3bca9fa2f795329a1bc7f31ad92ac02577ab600 (diff) | |
Merge branch 'pks-ci-fix-macos-runner' into 'master'
ci: Update to macOS M1 runners
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5881
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Sami Hiltunen <shiltunen@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91a8cdd00..343fe5cf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,7 +320,7 @@ test:fips: test:macos: image: macos-12-xcode-14 tags: - - shared-macos-amd64 + - saas-macos-medium-m1 needs: [] allow_failure: true stage: test @@ -332,7 +332,7 @@ test:macos: variables: <<: *test_variables CACHE_PREFIX: macos-12-xcode-14 - PGDATA: /usr/local/var/postgres + PGDATA: /tmp/postgres PGHOST: localhost PGUSER: gitlab before_script: @@ -346,7 +346,8 @@ test:macos: - go version - pg_ctl --version - ulimit -n 4096 # The default of 256 can lead to 'too many open files' errors when running parallel tests - - pg_ctl -D /usr/local/var/postgres start > /tmp/postgres.log + - pg_ctl init + - pg_ctl start - pg_ctl status - createdb -U $PGUSER $POSTGRES_DB - make -j$(nproc) build prepare-tests |