diff --git a/.gitlab-ci/make-minio-bucket.sh b/.gitlab-ci/make-minio-bucket.sh index 176c3cc16..1287696ba 100755 --- a/.gitlab-ci/make-minio-bucket.sh +++ b/.gitlab-ci/make-minio-bucket.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bash -p coreutils -p minio-client -export MC_HOST_minio-gitlab-runner-cache=https://$(cat /minio-gitlab-runner-cache/accesskey):$(cat /minio-gitlab-runner-cache/secretkey)@minio-gitlab-runner-cache:9000 +export MC_HOST_minio=https://$(cat /minio-gitlab-runner-cache/accesskey):$(cat /minio-gitlab-runner-cache/secretkey)@minio-gitlab-runner-cache:9000 -mc mb --ignore-existing minio-gitlab-runner-cache/nix-cache +mc mb --ignore-existing minio/nix-cache diff --git a/.gitlab-ci/nix.conf b/.gitlab-ci/nix.conf index c427db666..5c3f43fea 100644 --- a/.gitlab-ci/nix.conf +++ b/.gitlab-ci/nix.conf @@ -1,6 +1,6 @@ sandbox = true experimental-features = nix-command flakes ca-references -substituters = https://hydra.iohk.io https://cache.nixos.org/ s3://nix-cache?scheme=https&endpoint=minio-gitlab-runner-cache:9000 +substituters = https://hydra.iohk.io https://cache.nixos.org/ s3://nix-cache?scheme=http&endpoint=minio-gitlab-runner-cache:9000 trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= minio-gitlab-runner-cache:ZN5neq93MHqpnieHSBlxGgWvCL0WKrZ2S9QS+U5Bnro= require-sigs = true post-build-hook = /etc/nix/upload-to-cache.sh \ No newline at end of file diff --git a/.gitlab-ci/upload-to-cache.sh b/.gitlab-ci/upload-to-cache.sh index b176fcf26..68c7f1548 100755 --- a/.gitlab-ci/upload-to-cache.sh +++ b/.gitlab-ci/upload-to-cache.sh @@ -6,4 +6,4 @@ set -f # disable globbing export IFS=' ' echo "Signing and uploading paths" $OUT_PATHS -exec nix copy --to "s3://nix-cache?scheme=https&endpoint=minio-gitlab-runner-cache:9000&secret-key=${NIX_CACHE_KEYFILE}" $OUT_PATHS +exec nix copy --to "s3://nix-cache?scheme=http&endpoint=minio-gitlab-runner-cache:9000&secret-key=${NIX_CACHE_KEYFILE}" $OUT_PATHS