aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2021-03-18 19:07:56 +0100
committerAlex <alex@adnab.me>2021-03-18 19:07:56 +0100
commit8e317e2783189723376074845e8b6c55ded79ecb (patch)
treea2344f30471e617dd9c246232b60bc65d83616e6
parent797cda1c33d0b908492d2c08ece1c51c9b10f36d (diff)
parentec26acb16195f245a685d7c642a49be4db181971 (diff)
downloadgarage-8e317e2783189723376074845e8b6c55ded79ecb.tar.gz
garage-8e317e2783189723376074845e8b6c55ded79ecb.zip
Merge pull request 'try fixing CI' (#50) from trinity-1686a/garage:try-fix-ci into dev-0.2
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/50
-rw-r--r--.drone.yml36
1 files changed, 11 insertions, 25 deletions
diff --git a/.drone.yml b/.drone.yml
index 76379e40..68094a31 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,20 +2,9 @@ kind: pipeline
name: default
workspace:
- base: /drone
-
-clone:
- disable: true
+ base: /drone/garage
steps:
- - name: clone
- image: alpine/git
- commands:
- - mkdir -p cargo
- - git clone $DRONE_GIT_HTTP_URL
- - cd garage
- - git checkout $DRONE_COMMIT
-
- name: restore-cache
image: meltwater/drone-cache:dev
environment:
@@ -31,11 +20,11 @@ steps:
cache_key: '{{ .Repo.Name }}_{{ checksum "garage/Cargo.lock" }}_{{ arch }}_{{ os }}_gzip'
region: garage
mount:
- - 'garage/target'
- - 'cargo/registry/index'
- - 'cargo/registry/cache'
- - 'cargo/bin'
- - 'cargo/git/db'
+ - 'target'
+ - '/drone/cargo/registry/index'
+ - '/drone/cargo/registry/cache'
+ - '/drone/cargo/bin'
+ - '/drone/cargo/git/db'
path_style: true
endpoint: https://garage.deuxfleurs.fr
@@ -47,7 +36,6 @@ steps:
- apt-get update
- apt-get install --yes libsodium-dev
- pwd
- - cd garage
- cargo build
- name: cargo-test
@@ -57,7 +45,6 @@ steps:
commands:
- apt-get update
- apt-get install --yes libsodium-dev
- - cd garage
- cargo test
- name: rebuild-cache
@@ -75,11 +62,11 @@ steps:
cache_key: '{{ .Repo.Name }}_{{ checksum "garage/Cargo.lock" }}_{{ arch }}_{{ os }}_gzip'
region: garage
mount:
- - 'garage/target'
- - 'cargo/registry/index'
- - 'cargo/registry/cache'
- - 'cargo/git/db'
- - 'cargo/bin'
+ - 'target'
+ - '/drone/cargo/registry/index'
+ - '/drone/cargo/registry/cache'
+ - '/drone/cargo/git/db'
+ - '/drone/cargo/bin'
path_style: true
endpoint: https://garage.deuxfleurs.fr
@@ -91,5 +78,4 @@ steps:
- apt-get update
- apt-get install --yes libsodium-dev awscli python-pip
- pip install s3cmd
- - cd garage
- ./script/test-smoke.sh || (cat /tmp/garage.log; false)