diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-09 11:19:32 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-09 11:19:32 +0100 |
| commit | 1c85e5e428d8b449bb0e0933f329bcba3b583697 (patch) | |
| tree | a00c951c4f5a822722ba771e981b0e669a54ad86 | |
| parent | d35d4599de13d2bad95523547bb368f1c754a014 (diff) | |
| download | garage-1c85e5e428d8b449bb0e0933f329bcba3b583697.tar.gz garage-1c85e5e428d8b449bb0e0933f329bcba3b583697.zip | |
[nix-improvements] adapt woodpecker pipelines
| -rw-r--r-- | .woodpecker/debug.yaml | 4 | ||||
| -rw-r--r-- | .woodpecker/publish.yaml | 4 | ||||
| -rw-r--r-- | .woodpecker/release.yaml | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.woodpecker/debug.yaml b/.woodpecker/debug.yaml index 9486f672..59ae8c06 100644 --- a/.woodpecker/debug.yaml +++ b/.woodpecker/debug.yaml @@ -10,7 +10,7 @@ steps: - name: check formatting image: nixpkgs/nix:nixos-22.05 commands: - - nix-shell --attr rust --run "cargo fmt -- --check" + - nix-shell --attr devShell --run "cargo fmt -- --check" - name: build image: nixpkgs/nix:nixos-22.05 @@ -41,4 +41,4 @@ steps: image: nixpkgs/nix:nixos-22.05 commands: - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) + - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) diff --git a/.woodpecker/publish.yaml b/.woodpecker/publish.yaml index b45d379c..17b33d7f 100644 --- a/.woodpecker/publish.yaml +++ b/.woodpecker/publish.yaml @@ -16,7 +16,7 @@ steps: target: AWS_SECRET_ACCESS_KEY commands: - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf - - nix-shell --attr release --run "refresh_index" + - nix-shell --attr ci --run "refresh_index" # - name: multiarch-docker # image: nixpkgs/nix:nixos-22.05 @@ -29,4 +29,4 @@ steps: # - echo $DOCKER_AUTH > /root/.docker/config.json # - sha512sum /root/.docker/config.json # - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} -# - nix-shell --attr release --run "multiarch_docker" +# - nix-shell --attr ci --run "multiarch_docker" diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 8580441c..1d54e3cf 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -19,12 +19,12 @@ steps: image: nixpkgs/nix:nixos-22.05 commands: - nix-build --no-build-output --attr pkgs.${ARCH}.release --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - - nix-shell --attr rust --run "./script/not-dynamic.sh result-bin/bin/garage" + - nix-shell --attr ci --run "./script/not-dynamic.sh result-bin/bin/garage" - name: integration tests image: nixpkgs/nix:nixos-22.05 commands: - - nix-shell --attr integration --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) + - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) when: - matrix: ARCH: amd64 @@ -34,7 +34,7 @@ steps: - name: upgrade tests image: nixpkgs/nix:nixos-22.05 commands: - - nix-shell --attr integration --run "./script/test-upgrade.sh v0.8.4 x86_64-unknown-linux-musl" || (cat /tmp/garage.log; false) + - nix-shell --attr ci --run "./script/test-upgrade.sh v0.8.4 x86_64-unknown-linux-musl" || (cat /tmp/garage.log; false) when: - matrix: ARCH: amd64 @@ -49,7 +49,7 @@ steps: - source: garagehq_aws_secret_access_key target: AWS_SECRET_ACCESS_KEY commands: - - nix-shell --attr release --run "to_s3_woodpecker" + - nix-shell --attr ci --run "to_s3_woodpecker" # - name: docker build and publish # image: nixpkgs/nix:nixos-22.05 @@ -64,4 +64,4 @@ steps: # - echo $DOCKER_AUTH > /kaniko/.docker/config.json # - sha512sum /kaniko/.docker/config.json # - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} -# - nix-shell --attr release --run "to_docker" +# - nix-shell --attr ci --run "to_docker" |