@@ -70,13 +70,13 @@ jobs:
7070 - md5
7171 - scram-sha-256
7272 swiftver :
73- # - swift:5.2
73+ - swift:5.2
7474 - swift:5.3
75- - swiftlang/swift:nightly-5.3
75+ # - swiftlang/swift:nightly-5.3
7676 # - swiftlang/swift:nightly-master
7777 swiftos :
7878 # - xenial
79- - bionic
79+ # - bionic
8080 - focal
8181 # - centos7
8282 # - centos8
@@ -90,46 +90,54 @@ jobs:
9090 POSTGRES_USER : vapor_username
9191 POSTGRES_DB : vapor_database
9292 POSTGRES_PASSWORD : vapor_password
93- POSTGRES_HOST_AUTH_METHOD : ${{ matrix.authtype }}
93+ POSTGRES_HOST_AUTH_METHOD : ${{ matrix.dbauth }}
94+ POSTGRES_INITDB_ARGS : --auth-host=${{ matrix.dbauth }}
9495 steps :
95- # - name: SPM is incompatible with CentOS 7
96- # if: ${{ matrix.swiftos == 'centos7' }}
97- # run: |
98- # yum install -y make libcurl-devel
99- # git clone https://github.com/git/git -bv2.28.0 --depth 1 && cd git
100- # make prefix=/usr -j all install NO_OPENSSL=1 NO_EXPAT=1 NO_TCLTK=1 NO_GETTEXT=1 NO_PERL=1
10196 - name : Check out code
10297 uses : actions/checkout@v2
10398 - name : Run tests with Thread Sanitizer
10499 run : swift test --enable-test-discovery --sanitize=thread
105- env : { POSTGRES_HOSTNAME: 'psql' }
100+ env :
101+ POSTGRES_HOSTNAME : psql
102+ POSTGRES_USERNAME : vapor_username
103+ POSTGRES_PASSWORD : vapor_password
104+ POSTGRES_DATABASE : vapor_database
106105
107106 # Run package tests on macOS against supported PSQL versions
108107 macos :
109108 strategy :
110109 fail-fast : false
111110 matrix :
111+ xcode :
112+ - latest-stable
113+ - latest
112114 dbauth :
113115 - trust
114116 - md5
115117 - scram-sha-256
116118 formula :
117119 - postgresql@11
118120 - postgresql@12
121+ - postgresql@13
119122 runs-on : macos-latest
120123 steps :
121124 - name : Select latest available Xcode
122- uses :
maxim-lobanov/[email protected] 123- with : { 'xcode-version': latest }
125+ uses : maxim-lobanov/setup-xcode@v1
126+ with :
127+ xcode-version : ${{ matrix.xcode }}
124128 - name : Install Postgres, setup DB and auth, and wait for server start
125129 run : |
126130 export PATH="/usr/local/opt/${{ matrix.formula }}/bin:$PATH" PGDATA=/tmp/vapor-postgres-test
127131 brew install ${{ matrix.formula }}
128- initdb --locale=C -A ${{ matrix.dbauth }} -U vapor_username --pwfile=<(echo vapor_password)
132+ initdb --locale=C --auth-host ${{ matrix.dbauth }} -U vapor_username --pwfile=<(echo vapor_password)
129133 pg_ctl start --wait
130134 timeout-minutes : 5
131135 - name : Checkout code
132136 uses : actions/checkout@v2
133137 - name : Run tests with Thread Sanitizer
134138 run : swift test --enable-test-discovery --sanitize=thread
135- env : { POSTGRES_DATABASE: 'postgres' }
139+ env :
140+ POSTGRES_HOSTNAME : 127.0.0.1
141+ POSTGRES_USERNAME : vapor_username
142+ POSTGRES_PASSWORD : vapor_password
143+ POSTGRES_DATABASE : postgres
0 commit comments