From a2a2f259507ad8fb027759cac69dae9dd611a9bf Mon Sep 17 00:00:00 2001 From: "Maximilien R." Date: Sat, 10 Aug 2024 12:24:20 +0200 Subject: [PATCH] Revert "Update CI base images to nixos 24.05" This reverts commit 4dbde5a1aaba70c5f89ce988d8d2084da1342b40. --- .woodpecker/debug.yaml | 8 ++++---- .woodpecker/publish.yaml | 4 ++-- .woodpecker/release.yaml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.woodpecker/debug.yaml b/.woodpecker/debug.yaml index cbb56122..0076feda 100644 --- a/.woodpecker/debug.yaml +++ b/.woodpecker/debug.yaml @@ -9,17 +9,17 @@ when: steps: - name: check formatting - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 commands: - nix-shell --attr devShell --run "cargo fmt -- --check" - name: build - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 commands: - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - name: unit + func tests - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 environment: GARAGE_TEST_INTEGRATION_EXE: result-bin/bin/garage GARAGE_TEST_INTEGRATION_PATH: tmp-garage-integration @@ -41,7 +41,7 @@ steps: - rm -rv tmp-garage-integration - name: integration tests - image: nixpkgs/nix:nixos-24.05 + 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 ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) diff --git a/.woodpecker/publish.yaml b/.woodpecker/publish.yaml index f20704cc..739af2c4 100644 --- a/.woodpecker/publish.yaml +++ b/.woodpecker/publish.yaml @@ -8,7 +8,7 @@ depends_on: steps: - name: refresh-index - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 secrets: - source: garagehq_aws_access_key_id target: AWS_ACCESS_KEY_ID @@ -19,7 +19,7 @@ steps: - nix-shell --attr ci --run "refresh_index" - name: multiarch-docker - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 secrets: - docker_auth commands: diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 1a363656..c57d7272 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -16,18 +16,18 @@ matrix: steps: - name: build - image: nixpkgs/nix:nixos-24.05 + 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-24.05 + 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 ci --run "./script/not-dynamic.sh result-bin/bin/garage" - name: integration tests - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 commands: - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false) when: @@ -37,7 +37,7 @@ steps: ARCH: i386 - name: upgrade tests - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 commands: - nix-shell --attr ci --run "./script/test-upgrade.sh v0.8.4 x86_64-unknown-linux-musl" || (cat /tmp/garage.log; false) when: @@ -45,7 +45,7 @@ steps: ARCH: amd64 - name: push static binary - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 environment: TARGET: "${TARGET}" secrets: @@ -57,7 +57,7 @@ steps: - nix-shell --attr ci --run "to_s3" - name: docker build and publish - image: nixpkgs/nix:nixos-24.05 + image: nixpkgs/nix:nixos-22.05 environment: DOCKER_PLATFORM: "linux/${ARCH}" CONTAINER_NAME: "dxflrs/${ARCH}_garage"