From 3ab225a101fc86135de5b2ed5e7080b72572643b Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 11 May 2019 19:35:50 +0100 Subject: [PATCH] chore: remove caddy (#724) feat: remove caddy bug repo License: MIT Signed-off-by: Henrique Dias Former-commit-id: 4345a1d1b37df8b2d626c12e30415e13f70d5127 [formerly cbee013f5a8550dcd02efa3b3dc9a753126d5324] [formerly 6af0fc7ef5f751265163b91c5f7d004c822d72ae [formerly 0a37918677de5e539cad95af2323d34e6a6c2d2d]] Former-commit-id: f4493baf307b933be0fc9faec048ba0a707b0cdb [formerly 5dd46cd82f833b56fe5ef6017e7eaeaea6eb3ceb] Former-commit-id: efecca4f50951099c2dea55bd904ce9077c21a0c --- .ci/deploy_key.enc | Bin 3248 -> 0 bytes .github/ISSUE_TEMPLATE/caddy_bug_report.md | 6 --- wizard.sh | 41 --------------------- 3 files changed, 47 deletions(-) delete mode 100644 .ci/deploy_key.enc delete mode 100644 .github/ISSUE_TEMPLATE/caddy_bug_report.md diff --git a/.ci/deploy_key.enc b/.ci/deploy_key.enc deleted file mode 100644 index af98a5d43a69f54c02241acbb87ea06a777ff4b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 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 diff --git a/.github/ISSUE_TEMPLATE/caddy_bug_report.md b/.github/ISSUE_TEMPLATE/caddy_bug_report.md deleted file mode 100644 index b01b0daa..00000000 --- a/.github/ISSUE_TEMPLATE/caddy_bug_report.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Caddy related bug report -about: Create a report to help us improve ---- - -### Please open the issue on https://github.com/filebrowser/caddy/issues/new diff --git a/wizard.sh b/wizard.sh index d4cb0dad..21dc0662 100755 --- a/wizard.sh +++ b/wizard.sh @@ -121,46 +121,6 @@ lint () { fi } -pushRicebox () { - COMMIT_SHA="$(git rev-parse --verify HEAD | cut -c1-8)" - - cd $REPO - - eval `ssh-agent -s` - openssl aes-256-cbc -K $encrypted_9ca81b5594f5_key -iv $encrypted_9ca81b5594f5_iv -in ./.ci/deploy_key.enc -d | ssh-add - - - git clone git@github.com:filebrowser/caddy caddy - cd caddy - cp ../http/rice-box.go ./ - sed -i 's/package http/package caddy/g' ./rice-box.go - - go get -u github.com/filebrowser/filebrowser/v2@latest - - git checkout -b update-rice-box origin/master - git config --local user.name "Filebrowser Bot" - git config --local user.email "FilebrowserBot@users.noreply.github.com" - git commit -am "update rice-box $COMMIT_SHA" - - if [ $(git tag | grep "$TRAVIS_TAG" | wc -l) -ne 0 ]; then - git tag -d "$TRAVIS_TAG" - fi - - git tag "$TRAVIS_TAG" - - if [ "$(git ls-remote --heads origin update-rice-box)" != "" ]; then - git push -u origin update-rice-box - else - git push origin +update-rice-box - fi - - if [ "$(git ls-remote --heads origin update-rice-box)" != "" ]; then - git push origin "$TRAVIS_TAG" - else - git push origin :"$TRAVIS_TAG" - git push origin "$TRAVIS_TAG" - fi -} - ciRelease () { docker run --rm -t \ -v $(pwd):/src \ @@ -172,7 +132,6 @@ ciRelease () { goreleaser \ " - pushRicebox dockerPushTag }