diff --git a/.build.sh b/.build.sh deleted file mode 100644 index 7e69dce..0000000 --- a/.build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -ex -source /usr/local/rvm/environments/ruby-2.4.1 - -ruby --version -rvm --version -gem --version - -gem install bundler - -bundle install -# Check internal links -bundle exec htmlproofer ./_site --check-html --allow-hash-href --assume-extension --disable-external -# Check external -#bundle exec htmlproofer ./_site --check-html --allow-hash-href --assume-extension --external-only -bundle exec jekyll build diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml new file mode 100644 index 0000000..67af6d5 --- /dev/null +++ b/.github/workflows/PR.yml @@ -0,0 +1,16 @@ +name: Jekyll build for PRs + +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # Use GH action to build the website via Jekyll, but do not publish. + - uses: jeffreytse/jekyll-deploy-action@v0.5.0 + with: + provider: 'test' + token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }} diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..fada568 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,20 @@ +name: Jekyll build for PRs + +on: + push: + branches: + - master + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # Use GH action to build and publish into the gh-pages branch + - uses: jeffreytse/jekyll-deploy-action@v0.5.0 + with: + provider: 'github' + branch: 'gh-pages' + token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }} diff --git a/.publish.sh b/.publish.sh deleted file mode 100644 index 7c4446f..0000000 --- a/.publish.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -ex -source /usr/local/rvm/environments/ruby-2.4.1 -ruby --version -rvm --version -gem --version -gem install bundler -bundle install - - - -TMP_DIR=$(mktemp -d) -git checkout master -bundler exec jekyll build -d $TMP_DIR -git checkout gh-pages -rm -rf * -cp -Rv $TMP_DIR/. . - -git add . -git add --all * -git config --local user.name "UseGalaxy.EU Build Bot" -git config --local user.email "jenkins@usegalaxy.eu" - -git commit -m "Update site ($BUILD_NUMBER) - -$BUILD_URL" - -git push origin gh-pages -rm -rf $TMP_DIR diff --git a/Gemfile.lock b/Gemfile.lock index 3bf7c9b..8c0aafd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) yell (2.2.2) diff --git a/index.md b/index.md index cca045c..ad1c93b 100644 --- a/index.md +++ b/index.md @@ -13,9 +13,9 @@ For UseGalaxy.eu ## GDPR Documentation - [Your Rights Under the GDPR](./gdpr-rights.html) -- [Legitimate Interest Analyses](./lia/) +- [Legitimate Interest Analyses](./lia/index.html) - [Data Storage and Access](./gdpr-docs.html) -- [Data Processing Activities Register](./dpa/) +- [Data Processing Activities Register](./dpa/index.html) ## Contact