From d2af65cbce2942119ca61605f082ad99324587d6 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 22 Jan 2022 23:15:36 +0100 Subject: [PATCH] It's in the builder now [CI SKIP] --- .woodpecker/.build.yml | 3 --- .woodpecker/.release.yml | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 516fb206..b91f7cc6 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -40,9 +40,6 @@ pipeline: image: 'alpine:latest' secrets: [ s3_username, s3_password ] commands: - # We should just add this to the builder image instead - - apk add curl openssl - # https://gist.github.com/JustinTimperio/7c7115f87b775618637d67ac911e595f - export URL=s3.rustybever.be - export OBJ_PATH="/vieter/commits/$CI_COMMIT_SHA/vieter-$(echo '${PLATFORM}' | sed 's:/:-:g')" diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 2e32c7f9..bc43b900 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -16,10 +16,8 @@ pipeline: # Write the title to a file that the plugin can then read - echo "$(git describe --tags --abbrev=0 2> /dev/null || echo '0.0.0')-$(git rev-list --count ^dev)" > title - cat title - - wget https://dl.min.io/client/mc/release/linux-amd64/mc - - chmod +x mc - - ./mc alias set s3/ https://s3.rustybever.be "$S3_USERNAME" "$S3_PASSWORD" - - ./mc cp -r "s3/vieter/commits/$CI_COMMIT_SHA" assets + - mc alias set s3/ https://s3.rustybever.be "$S3_USERNAME" "$S3_PASSWORD" + - mc cp -r "s3/vieter/commits/$CI_COMMIT_SHA" assets release: image: 'plugins/gitea-release'