diff --git a/.woodpecker/deploy-cloudflare.yaml b/.woodpecker/deploy-cloudflare.yaml deleted file mode 100644 index 1f281ab..0000000 --- a/.woodpecker/deploy-cloudflare.yaml +++ /dev/null @@ -1,41 +0,0 @@ -steps: - build: - image: golang:1.21-bookworm - environment: - - HUGO_VERSION=0.123.4 - - TZ=Europe/Berlin - when: - - event: push - branch: [main, staging] - commands: - - wget https://github.com/gohugoio/hugo/releases/download/v$${HUGO_VERSION}/hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && apt install ./hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && rm -f hugo_extended_$${HUGO_VERSION}_linux-amd64.deb - - hugo --minify --destination ./public - - deploy-cloudflare-production: - image: node:alpine - # image: lauralani/netlify-cli:latest - pull: true - when: - - event: push - branch: main - secrets: - - CLOUDFLARE_ACCOUNT_ID - - CLOUDFLARE_API_TOKEN - commands: - - npm install wrangler --save-dev - - npx wrangler pages deploy ./public --project-name adorable-website - - - #deploy-production: - # # image: node:alpine - # image: lauralani/netlify-cli:latest - # pull: true - # when: - # - event: push - # branch: main - # secrets: - # - NETLIFY_AUTH_TOKEN - # - NETLIFY_SITE_ID - # commands: - # # - npm install netlify-cli -g - # - netlify deploy --prod --dir ./public diff --git a/.woodpecker/deploy-netlify.yaml b/.woodpecker/deploy-netlify.yaml deleted file mode 100644 index fca9ce5..0000000 --- a/.woodpecker/deploy-netlify.yaml +++ /dev/null @@ -1,41 +0,0 @@ -steps: - build: - image: golang:1.21-bookworm - environment: - - HUGO_VERSION=0.123.4 - - TZ=Europe/Berlin - when: - - event: push - branch: [main, staging] - commands: - - wget https://github.com/gohugoio/hugo/releases/download/v$${HUGO_VERSION}/hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && apt install ./hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && rm -f hugo_extended_$${HUGO_VERSION}_linux-amd64.deb - - hugo --minify --destination ./public - - deploy-staging: - # image: node:alpine - image: lauralani/netlify-cli:latest - pull: true - when: - - event: push - branch: staging - secrets: - - NETLIFY_AUTH_TOKEN - - NETLIFY_SITE_ID - commands: - # - npm install netlify-cli -g - - netlify deploy --alias stage --dir ./public - - - deploy-production: - # image: node:alpine - image: lauralani/netlify-cli:latest - pull: true - when: - - event: push - branch: main - secrets: - - NETLIFY_AUTH_TOKEN - - NETLIFY_SITE_ID - commands: - # - npm install netlify-cli -g - - netlify deploy --prod --dir ./public diff --git a/.woodpecker/deploy-rsync.yaml b/.woodpecker/deploy-rsync.yaml index ca8339b..15b79b0 100644 --- a/.woodpecker/deploy-rsync.yaml +++ b/.woodpecker/deploy-rsync.yaml @@ -1,8 +1,8 @@ steps: build: - image: golang:1.21-bookworm + image: golang:1.22-bookworm environment: - - HUGO_VERSION=0.123.4 + - HUGO_VERSION=0.128.2 - TZ=Europe/Berlin when: - event: push @@ -11,37 +11,42 @@ steps: - wget https://github.com/gohugoio/hugo/releases/download/v$${HUGO_VERSION}/hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && apt install ./hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && rm -f hugo_extended_$${HUGO_VERSION}_linux-amd64.deb - hugo --minify --destination ./public - upload: + upload-prod: image: alpine:latest + when: + - branch: main secrets: - RSYNC_SSHKEY - RSYNC_TARGET_SERVER - RSYNC_TARGET_USER environment: - TARGET_PATH=/webroot/adora.codes - when: - - event: push - branch: main + - RSYNC_TARGET_PORT=2003 commands: + - cd docs/ - apk add --update --no-cache openssh rsync git - mkdir -p $HOME/.ssh - echo "$RSYNC_SSHKEY" > $HOME/.ssh/id_ed25519 - chmod 0600 $HOME/.ssh/id_ed25519 - - ssh-keyscan -t ed25519 $RSYNC_TARGET_SERVER >> $HOME/.ssh/known_hosts - - rsync -avh --delete ./public/ $RSYNC_TARGET_USER@$RSYNC_TARGET_SERVER:$TARGET_PATH + - ssh-keyscan -t ed25519 -p $RSYNC_TARGET_PORT $RSYNC_TARGET_SERVER >> $HOME/.ssh/known_hosts + - rsync -avh -e "ssh -p $RSYNC_TARGET_PORT" --delete ./public/ $RSYNC_TARGET_USER@$RSYNC_TARGET_SERVER:$TARGET_PATH - - - #deploy-production: - # # image: node:alpine - # image: lauralani/netlify-cli:latest - # pull: true - # when: - # - event: push - # branch: main - # secrets: - # - NETLIFY_AUTH_TOKEN - # - NETLIFY_SITE_ID - # commands: - # # - npm install netlify-cli -g - # - netlify deploy --prod --dir ./public + upload-staging: + image: alpine:latest + when: + - branch: staging + secrets: + - RSYNC_SSHKEY + - RSYNC_TARGET_SERVER + - RSYNC_TARGET_USER + environment: + - TARGET_PATH=/webroot/www-staging.adora.codes + - RSYNC_TARGET_PORT=2003 + commands: + - cd docs/ + - apk add --update --no-cache openssh rsync git + - mkdir -p $HOME/.ssh + - echo "$RSYNC_SSHKEY" > $HOME/.ssh/id_ed25519 + - chmod 0600 $HOME/.ssh/id_ed25519 + - ssh-keyscan -t ed25519 -p $RSYNC_TARGET_PORT $RSYNC_TARGET_SERVER >> $HOME/.ssh/known_hosts + - rsync -avh -e "ssh -p $RSYNC_TARGET_PORT" --delete ./public/ $RSYNC_TARGET_USER@$RSYNC_TARGET_SERVER:$TARGET_PATH diff --git a/netlify.toml b/netlify.toml deleted file mode 100644 index 5b88b9b..0000000 --- a/netlify.toml +++ /dev/null @@ -1,11 +0,0 @@ -# Redirect netlify alias - -[[redirects]] - from = "https://personal-website-40cb76.netlify.app/" - to = "https://adora.codes/" - status = 301 - -[[redirects]] - from = "https://personal-website-40cb76.netlify.app/*" - to = "https://adora.codes/" - status = 301 \ No newline at end of file