From 7238e2c96e42bf2b1efc861fa6f88198e9a38193 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 19 Oct 2019 19:00:23 +0200 Subject: [PATCH] Remove repo download Signed-off-by: Knut Ahlers --- bin/aur2repo | 8 ++------ bin/git2repo | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bin/aur2repo b/bin/aur2repo index 8cea7c0..41f147e 100755 --- a/bin/aur2repo +++ b/bin/aur2repo @@ -24,10 +24,6 @@ vault read --field=key secret/jenkins/arch-signing >"${TMPDIR}/cfg/signing.asc" step "Re-fetching Docker image" docker pull luzifer/arch-repo-builder -step "Synchronizing the repository" -vault2env --key=secret/aws/private -- \ - aws s3 sync --delete s3://arch-luzifer-io/repo/x86_64/ "${REPO_DIR}/" - step "Building AUR package" docker run --rm -ti \ -v "${TMPDIR}/src:/src" \ @@ -37,5 +33,5 @@ docker run --rm -ti \ "https://aur.archlinux.org/${PACKAGE}.git" step "Synchronizing repository changes" -vault2env --key=secret/aws/private -- \ - aws s3 sync --delete --exclude '*.old*' --acl=public-read "${REPO_DIR}/" s3://arch-luzifer-io/repo/x86_64/ +cd "${REPO_DIR}" +make upload diff --git a/bin/git2repo b/bin/git2repo index 77cd67b..c91c86e 100755 --- a/bin/git2repo +++ b/bin/git2repo @@ -24,10 +24,6 @@ vault read --field=key secret/jenkins/arch-signing >"${TMPDIR}/cfg/signing.asc" step "Re-fetching Docker image" docker pull luzifer/arch-repo-builder -step "Synchronizing the repository" -vault2env --key=secret/aws/private -- \ - aws s3 sync --delete s3://arch-luzifer-io/repo/x86_64/ "${REPO_DIR}/" - step "Building git URL" docker run --rm -ti \ -v "${TMPDIR}/src:/src" \ @@ -37,5 +33,5 @@ docker run --rm -ti \ "${URL}" step "Synchronizing repository changes" -vault2env --key=secret/aws/private -- \ - aws s3 sync --delete --exclude '*.old*' --acl=public-read "${REPO_DIR}/" s3://arch-luzifer-io/repo/x86_64/ +cd "${REPO_DIR}" +make upload