diff --git a/.gitlab-ci/debug-aws.patch b/.gitlab-ci/debug-aws.patch deleted file mode 100644 index f4a250b96..000000000 --- a/.gitlab-ci/debug-aws.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc -index 514ab3bf9..25dab18bb 100644 ---- a/src/libstore/filetransfer.cc -+++ b/src/libstore/filetransfer.cc -@@ -696,6 +696,8 @@ struct curlFileTransfer : public FileTransfer - std::string scheme = get(params, "scheme").value_or(""); - std::string endpoint = get(params, "endpoint").value_or(""); - -+ debug("enqueueFileTransfer: scheme: %s", scheme); -+ - S3Helper s3Helper(profile, region, scheme, endpoint); - - // FIXME: implement ETag -diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc -index 6bfbee044..ff406e5e4 100644 ---- a/src/libstore/s3-binary-cache-store.cc -+++ b/src/libstore/s3-binary-cache-store.cc -@@ -126,6 +126,7 @@ ref S3Helper::makeConfig(const string & region - initAWS(); - auto res = make_ref(); - res->region = region; -+ debug("configuring scheme %s", scheme); - if (!scheme.empty()) { - res->scheme = Aws::Http::SchemeMapper::FromString(scheme.c_str()); - } diff --git a/.gitlab-ci/debug-aws.patch.license b/.gitlab-ci/debug-aws.patch.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/debug-aws.patch.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/.gitlab-ci/fix-aws-scheme.patch b/.gitlab-ci/fix-aws-scheme.patch deleted file mode 100644 index ac9416262..000000000 --- a/.gitlab-ci/fix-aws-scheme.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc -index 6bfbee044..51d86c4e6 100644 ---- a/src/libstore/s3-binary-cache-store.cc -+++ b/src/libstore/s3-binary-cache-store.cc -@@ -209,7 +209,7 @@ struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual - S3Helper s3Helper; - - S3BinaryCacheStoreImpl( -- const std::string & scheme, -+ const std::string & uriScheme, - const std::string & bucketName, - const Params & params) - : StoreConfig(params) diff --git a/.gitlab-ci/fix-aws-scheme.patch.license b/.gitlab-ci/fix-aws-scheme.patch.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/fix-aws-scheme.patch.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/.gitlab-ci/make-minio-bucket.sh b/.gitlab-ci/make-minio-bucket.sh deleted file mode 100755 index b8542b5be..000000000 --- a/.gitlab-ci/make-minio-bucket.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -#!/usr/bin/bash - -export MC_HOST_minio=http://$(cat /minio-gitlab-runner-cache/accesskey):$(cat /minio-gitlab-runner-cache/secretkey)@minio-gitlab-runner-cache - -mc mb --ignore-existing minio/nix-cache diff --git a/.gitlab-ci/patched-nix.nix b/.gitlab-ci/patched-nix.nix deleted file mode 100644 index d2951df8d..000000000 --- a/.gitlab-ci/patched-nix.nix +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -{ pkgs ? import {} }: -pkgs.nixUnstable.overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [] ++ [ ./fix-aws-scheme.patch ]; -}) diff --git a/.gitlab-ci/upload-to-cache.sh b/.gitlab-ci/upload-to-cache.sh deleted file mode 100755 index c2ea9bc7e..000000000 --- a/.gitlab-ci/upload-to-cache.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -#!/usr/bin/bash - -set -eu -set -f # disable globbing -export IFS=' ' - -echo "Signing and uploading paths" $OUT_PATHS -exec nix copy --to "s3://nix-cache?region=us-east-1&scheme=http&endpoint=minio-gitlab-runner-cache&secret-key=${NIX_CACHE_KEYFILE}" $OUT_PATHS diff --git a/.gitlab-ci/write-minio-creds.sh b/.gitlab-ci/write-minio-creds.sh deleted file mode 100755 index fb3387fa2..000000000 --- a/.gitlab-ci/write-minio-creds.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -#!/usr/bin/bash - -mkdir -p $(dirname ${AWS_SHARED_CREDENTIALS_FILE}) -cat > ${AWS_SHARED_CREDENTIALS_FILE} <