@@ -70,13 +70,13 @@ jobs:
70
70
- md5
71
71
- scram-sha-256
72
72
swiftver :
73
- # - swift:5.2
73
+ - swift:5.2
74
74
- swift:5.3
75
- - swiftlang/swift:nightly-5.3
75
+ # - swiftlang/swift:nightly-5.3
76
76
# - swiftlang/swift:nightly-master
77
77
swiftos :
78
78
# - xenial
79
- - bionic
79
+ # - bionic
80
80
- focal
81
81
# - centos7
82
82
# - centos8
@@ -90,46 +90,54 @@ jobs:
90
90
POSTGRES_USER : vapor_username
91
91
POSTGRES_DB : vapor_database
92
92
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 }}
94
95
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
101
96
- name : Check out code
102
97
uses : actions/checkout@v2
103
98
- name : Run tests with Thread Sanitizer
104
99
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
106
105
107
106
# Run package tests on macOS against supported PSQL versions
108
107
macos :
109
108
strategy :
110
109
fail-fast : false
111
110
matrix :
111
+ xcode :
112
+ - latest-stable
113
+ - latest
112
114
dbauth :
113
115
- trust
114
116
- md5
115
117
- scram-sha-256
116
118
formula :
117
119
- postgresql@11
118
120
- postgresql@12
121
+ - postgresql@13
119
122
runs-on : macos-latest
120
123
steps :
121
124
- name : Select latest available Xcode
122
- uses : maxim-lobanov/setup-xcode@1.0
123
- with : { 'xcode-version': latest }
125
+ uses : maxim-lobanov/setup-xcode@v1
126
+ with :
127
+ xcode-version : ${{ matrix.xcode }}
124
128
- name : Install Postgres, setup DB and auth, and wait for server start
125
129
run : |
126
130
export PATH="/usr/local/opt/${{ matrix.formula }}/bin:$PATH" PGDATA=/tmp/vapor-postgres-test
127
131
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)
129
133
pg_ctl start --wait
130
134
timeout-minutes : 5
131
135
- name : Checkout code
132
136
uses : actions/checkout@v2
133
137
- name : Run tests with Thread Sanitizer
134
138
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