From 1c85e5e428d8b449bb0e0933f329bcba3b583697 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 9 Feb 2024 11:19:32 +0100
Subject: [nix-improvements] adapt woodpecker pipelines

---
 .woodpecker/release.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.woodpecker/release.yaml')

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"
-- 
cgit v1.2.3


From 555ed75548d2f42f9d86cc2b8d6844e6b7d35740 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 9 Feb 2024 11:36:51 +0100
Subject: [nix-improvements] ci: check static as separate step

---
 .woodpecker/release.yaml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.woodpecker/release.yaml')

diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml
index 1d54e3cf..e5db48b8 100644
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -16,6 +16,11 @@ matrix:
 
 steps:
   - name: build
+    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}
+
+  - name: check is static binary
     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}
-- 
cgit v1.2.3


From 1be75fbf4e750d03e1f091016ef44814da674126 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 9 Feb 2024 11:40:35 +0100
Subject: [nix-improvements] fix kaniko and manifest-tool

---
 .woodpecker/release.yaml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to '.woodpecker/release.yaml')

diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml
index e5db48b8..8f19be82 100644
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -56,17 +56,15 @@ steps:
     commands:
       - nix-shell --attr ci --run "to_s3_woodpecker"
 
-#  - name: docker build and publish
-#    image: nixpkgs/nix:nixos-22.05
-#    environment:
-#      DOCKER_PLATFORM: "linux/${ARCH}"
-#      CONTAINER_NAME: "dxflrs/${ARCH}_garage"
-#      HOME: "/kaniko"
-#    secrets:
-#      - docker_auth
-#    commands:
-#      - mkdir -p /kaniko/.docker
-#      - echo $DOCKER_AUTH > /kaniko/.docker/config.json
-#      - sha512sum /kaniko/.docker/config.json
-#      - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
-#      - nix-shell --attr ci --run "to_docker"
+  - name: docker build and publish
+    image: nixpkgs/nix:nixos-22.05
+    environment:
+      DOCKER_PLATFORM: "linux/${ARCH}"
+      CONTAINER_NAME: "dxflrs/${ARCH}_garage"
+    secrets:
+      - docker_auth
+    commands:
+      - mkdir -p /root/.docker
+      - echo $DOCKER_AUTH > /root/.docker/config.json
+      - export CONTAINER_TAG=${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
+      - nix-shell --attr ci --run "to_docker"
-- 
cgit v1.2.3


From 561fad0b44f78372357c1c76e3708a062d703b33 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 9 Feb 2024 12:19:16 +0100
Subject: [nix-improvements] get rid of Drone

---
 .woodpecker/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.woodpecker/release.yaml')

diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml
index 8f19be82..c57d7272 100644
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -54,7 +54,7 @@ steps:
       - source: garagehq_aws_secret_access_key
         target: AWS_SECRET_ACCESS_KEY
     commands:
-      - nix-shell --attr ci --run "to_s3_woodpecker"
+      - nix-shell --attr ci --run "to_s3"
 
   - name: docker build and publish
     image: nixpkgs/nix:nixos-22.05
-- 
cgit v1.2.3