diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml deleted file mode 100644 index 5d60035..0000000 --- a/.forgejo/workflows/cleanup.yaml +++ /dev/null @@ -1,24 +0,0 @@ -on: - pull_request: - types: - - closed - -jobs: - cleanup-staging: - runs-on: docker - container: - image: code.forgejo.org/oci/node:20-bookworm - steps: - - name: Pipeline info PR - run: | - echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}" - - - name: Staging Deployment - Prepare keys - run: | - echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv - chmod 400 deploykey.priv - echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts - - - name: Staging Deployment - Remove PR from staging - run: | - ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/" diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml deleted file mode 100644 index 68362bf..0000000 --- a/.forgejo/workflows/deploy.yaml +++ /dev/null @@ -1,82 +0,0 @@ -on: - push: - branches: - - master - pull_request: - -env: - TZ: Europe/Berlin - -jobs: - build: - runs-on: docker - container: - image: docker.io/hugomods/hugo:0.147.9 - steps: - - name: Pipeline info - run: | - echo "Run triggered by ${{ github.event_name }} (${{ github.event.action }}) on ref ${{ github.ref_name }}" - - - name: Install packages - run: | - apk update - # For CI actions. - apk add nodejs-current - # For website build. - apk add tzdata coreutils curl jq git - # For uploading. - apk add rsync openssh - - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # pull full history for page lastmod by git commit date - submodules: recursive - - - name: Patch baseURL (staging only) - if: github.ref_name != 'master' - run: | - sed -i 's#baseurl = "https://cryptoparty-hamburg.de"#baseurl = "https://staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/"#' config.toml - - - name: Build website (prod) - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'master' - run: | - hugo - - - name: Build website (staging) - if: github.ref_name != 'master' - run: | - hugo --buildFuture --buildDrafts - - - name: Deploy - Prepare keys - if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' - run: | - echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv - chmod 400 deploykey.priv - echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts - - - name: Deploy - Upload PR to staging - if: github.event_name == 'pull_request' - run: | - echo "Deploying to staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}" - rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/ - - - name: Deploy - Add comment to PR with staging URL - if: github.event_name == 'pull_request' && github.event.action == 'opened' - run: | - curl \ - -X POST \ - ${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \ - -H "Content-Type: application/json" \ - -H "Authorization: token $GITHUB_TOKEN" \ - --data '{ "body": "You can view your changes at https://staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/" }' - - - name: Deploy - Upload to prod - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'master' - run: | - rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/cryptoparty-hamburg.de/ - - - uses: actions/upload-artifact@v3 - if: github.event_name == 'pull_request' - with: - name: website-build - path: public/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..d7034de --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,32 @@ +image: debian:buster-slim +before_script: + - apt update -qq + +stages: + - build + - deploy + +build_job: + stage: build + script: + - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 make hugo + - make + artifacts: + paths: + - public + variables: + GIT_SUBMODULE_STRATEGY: normal + +deploy_job: + stage: deploy + script: + - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 openssh-client rsync + - umask 0077 + - mkdir $HOME/.ssh + - eval $(ssh-agent -s) + - echo "$RSYNC_TARGET_SECRET_KEY" | ssh-add - + - echo "[$RSYNC_TARGET_HOST]:$RSYNC_TARGET_PORT $RSYNC_TARGET_HOST_KEY" > $HOME/.ssh/known_hosts + - rsync -av --delete -e "ssh -p $RSYNC_TARGET_PORT" public/* "$RSYNC_TARGET_USER@$RSYNC_TARGET_HOST:/" + only: + - master + - hugo diff --git a/themes/beautifulhugo b/themes/beautifulhugo index e69e25d..08cfb44 160000 --- a/themes/beautifulhugo +++ b/themes/beautifulhugo @@ -1 +1 @@ -Subproject commit e69e25d4ca0d3c737f0677995d2bf9541ffb4926 +Subproject commit 08cfb448c8fdc63425dea4c8eeee69c21c45b614