Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McDonnell <jmcdonnell@gitlab.com>2023-05-17 18:25:47 +0300
committerJohn McDonnell <jmcdonnell@gitlab.com>2023-05-22 15:15:04 +0300
commitda2a0dbb74e037380f2cd30870bfa026ccc1d033 (patch)
tree6cba3f189d79075795d3f4ff03dcc12e63439119
parent08592100689bbcd173d44a340134e020d69e182b (diff)
Update macos job to use saas-macos-medium-m1jmd/update-macos-runner-to-m1
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f62607ab4..b80d69f52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -324,7 +324,7 @@ test:fips:
test:macos:
image: macos-12-xcode-14
tags:
- - shared-macos-amd64
+ - saas-macos-medium-m1
needs: []
allow_failure: true
stage: test
@@ -336,7 +336,7 @@ test:macos:
variables:
<<: *test_variables
CACHE_PREFIX: macos-12-xcode-14
- PGDATA: /usr/local/var/postgres
+ PGDATA: /opt/homebrew/var/postgresql@14
PGHOST: localhost
PGUSER: gitlab
before_script:
@@ -350,7 +350,7 @@ 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 -D ${PGDATA} start > /tmp/postgres.log
- pg_ctl status
- createdb -U $PGUSER $POSTGRES_DB
- make -j$(nproc) build prepare-tests