Skip to content

Commit b84bd8f

Browse files
committed
Auto merge of #1867 - jtgeibel:run-ci-on-bionic, r=jtgeibel
Bump CI stack from xenial to bionic We'll want to synchronize this bump with a bump to the `heroku-18` stack in production. See the tracking issue for details. closes: #1868
2 parents c333bc0 + 3b46fa5 commit b84bd8f

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
frontend:
1414
name: Frontend
15-
runs-on: ubuntu-16.04
15+
runs-on: ubuntu-18.04
1616
env:
1717
JOBS: 1 # See https://git.io/vdao3 for details.
1818

@@ -175,7 +175,7 @@ jobs:
175175

176176
- name: Setup database
177177
run: |
178-
which diesel || cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres
178+
which diesel || cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres --debug
179179
diesel database setup --locked-schema
180180
181181
- name: Lint

.travis.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: rust
2-
sudo: required
3-
dist: xenial
2+
dist: bionic
3+
os: linux
44

55
branches:
66
only:
@@ -18,36 +18,32 @@ env:
1818
global:
1919
- RUST_BACKTRACE=1
2020
- JOBS=1 # See https://git.io/vdao3 for details.
21-
- DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
22-
- TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
21+
- DATABASE_URL=postgres:///cargo_registry_test
22+
- TEST_DATABASE_URL=postgres:///cargo_registry_test
2323
- CARGO_INCREMENTAL=0
2424
# Percy secrets are included here to enable Percy's GitHub integration
2525
# on community-submitted PRs
2626
- PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
2727
- PERCY_PROJECT=crates-io/crates.io
28-
- PGPORT=5433
2928
- PATH=$HOME/.cargo/bin:$PATH
3029
- RUSTFLAGS="-C debuginfo=0 -D warnings"
3130
- MALLOC_CONF=background_thread:true,abort_conf:true,abort:true,junk:true
3231

3332
install:
34-
- sudo cp /etc/postgresql/10/main/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
35-
- sudo systemctl restart postgresql@11-main
3633
- script/ci/cargo-clean-on-new-rustc-version.sh
37-
- which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres
34+
- which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres --debug
3835

3936
before_script:
4037
- diesel database setup --locked-schema
4138

4239
addons:
43-
chrome: stable
4440
postgresql: "11"
4541
apt:
4642
packages:
4743
- postgresql-11
4844
- postgresql-client-11
4945

50-
matrix:
46+
jobs:
5147
fast_finish: true
5248
allow_failures:
5349
- rust: nightly
@@ -64,6 +60,8 @@ matrix:
6460
- name: Frontend
6561
language: node_js
6662
node_js: 12
63+
addons:
64+
chrome: stable
6765
install:
6866
- npm ci
6967
before_script: skip

0 commit comments

Comments
 (0)