From dd22a14147496656f98406960d53c7571a60d06e Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 7 Mar 2024 23:47:40 -0500 Subject: [PATCH] bump CI deps (CVE-2024-27297 / GHSA-2ffj-w4mj-pg37) Signed-off-by: strawberry --- .github/workflows/ci.yml | 2 +- .gitlab-ci.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4afe924..ba65a49c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Install Nix (with flakes and nix-command enabled) - uses: cachix/install-nix-action@v25 + uses: cachix/install-nix-action@v26 with: nix_path: nixpkgs=channel:nixos-unstable diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1d8163d..336118b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ before_script: ci: stage: ci - image: nixos/nix:2.20.4 + image: nixos/nix:2.20.5 script: # Cache the inputs required for the devShell - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation @@ -66,7 +66,7 @@ ci: artifacts: stage: artifacts - image: nixos/nix:2.20.4 + image: nixos/nix:2.20.5 script: - ./bin/nix-build-and-cache .#static-x86_64-unknown-linux-musl - cp result/bin/conduit x86_64-unknown-linux-musl @@ -110,9 +110,9 @@ artifacts: .push-oci-image: stage: publish - image: docker:25.0.3 + image: docker:25.0.4 services: - - docker:25.0.3-dind + - docker:25.0.4-dind variables: IMAGE_SUFFIX_AMD64: amd64 IMAGE_SUFFIX_ARM64V8: arm64v8