Skip to content

Commit 8f50d43

Browse files
committed
Switch to PPA package for diesel CLI installation
1 parent fc0c266 commit 8f50d43

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ jobs:
6363

6464
env:
6565
RUST_BACKTRACE: 1
66-
DATABASE_URL: postgres:///cargo_registry_test
67-
TEST_DATABASE_URL: postgres:///cargo_registry_test
66+
DATABASE_URL: postgres://postgres@localhost/cargo_registry_test
67+
TEST_DATABASE_URL: postgres://postgres@localhost/cargo_registry_test
6868
CARGO_INCREMENTAL: 0
6969
RUSTFLAGS: "-C debuginfo=0 -D warnings"
7070
MALLOC_CONF: "background_thread:true,abort_conf:true,abort:true,junk:true"

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ env:
3131

3232
install:
3333
- script/ci/cargo-clean-on-new-rustc-version.sh
34-
- which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres --debug
3534

3635
before_script:
3736
- diesel database setup --locked-schema
@@ -40,9 +39,12 @@ addons:
4039
chrome: stable
4140
postgresql: "11"
4241
apt:
42+
sources:
43+
- sourceline: 'ppa:jtgeibel/rust-backports'
4344
packages:
4445
- postgresql-11
4546
- postgresql-client-11
47+
- diesel-cli
4648

4749
matrix:
4850
fast_finish: true

script/ci/cargo-clean-on-new-rustc-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
manual_stamp_file=target/ci_manual_stamp
6-
manual_stamp=9 # Change this to force a clean build on CI
6+
manual_stamp=10 # Change this to force a clean build on CI
77

88
if [ -f $manual_stamp_file ]; then
99
if echo "$manual_stamp" | cmp -s $manual_stamp_file -; then

0 commit comments

Comments
 (0)