From 1b046ef44852b65651f8ab7bddbce7bfa39825ad Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:57:56 +0100 Subject: [PATCH 1/8] Jekylls GH action added --- .github/workflows/PR.yml | 24 ++++++++++++++++++++++++ .github/workflows/merge.yml | 27 +++++++++++++++++++++++++++ index.md | 6 +++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/PR.yml create mode 100644 .github/workflows/merge.yml diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml new file mode 100644 index 0000000..9eb21ae --- /dev/null +++ b/.github/workflows/PR.yml @@ -0,0 +1,24 @@ +name: Jekyll build for PRs + +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # Use GitHub Actions' cache to cache dependencies on servers + - uses: actions/cache@v3 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + + # 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.GITHUB_TOKEN }} diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..5a38b63 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,27 @@ +name: Jekyll build for PRs + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # Use GitHub Actions' cache to cache dependencies on servers + - uses: actions/cache@v3 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + + # 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.GITHUB_TOKEN }} diff --git a/index.md b/index.md index 2e124cd..ad1c93b 100644 --- a/index.md +++ b/index.md @@ -6,16 +6,16 @@ title: GDPR Compliance Documentation For UseGalaxy.eu ## ToS & PP - +- [Definitions and scope](./scope.html) - [Privacy Policy](./privacy-policy.html) - [Terms of Service](./tos.html) ## 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 From bca2d0699fef4f60c5ae6658b59ef555dc545e29 Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:00:40 +0100 Subject: [PATCH 2/8] eliminate old WFs --- .build.sh | 16 ---------------- .publish.sh | 29 ----------------------------- 2 files changed, 45 deletions(-) delete mode 100644 .build.sh delete mode 100644 .publish.sh 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/.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 From c01cbcbed2c2907dd3111e9a9ef2f91f7f924c61 Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:05:41 +0100 Subject: [PATCH 3/8] simplify WFs --- .github/workflows/PR.yml | 8 -------- .github/workflows/merge.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 9eb21ae..306d281 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -9,14 +9,6 @@ jobs: steps: - uses: actions/checkout@v4 - # Use GitHub Actions' cache to cache dependencies on servers - - uses: actions/cache@v3 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - # Use GH action to build the website via Jekyll, but do not publish. - uses: jeffreytse/jekyll-deploy-action@v0.5.0 with: diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 5a38b63..633999c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -11,14 +11,6 @@ jobs: steps: - uses: actions/checkout@v4 - # Use GitHub Actions' cache to cache dependencies on servers - - uses: actions/cache@v3 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - # Use GH action to build and publish into the gh-pages branch - uses: jeffreytse/jekyll-deploy-action@v0.5.0 with: From c06cb5b0f53dd50d93e09f3ff336c752b0852b1e Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:08:40 +0100 Subject: [PATCH 4/8] Revert "eliminate old WFs" This reverts commit bca2d0699fef4f60c5ae6658b59ef555dc545e29. --- .build.sh | 16 ++++++++++++++++ .publish.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .build.sh create mode 100644 .publish.sh diff --git a/.build.sh b/.build.sh new file mode 100644 index 0000000..7e69dce --- /dev/null +++ b/.build.sh @@ -0,0 +1,16 @@ +#!/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/.publish.sh b/.publish.sh new file mode 100644 index 0000000..7c4446f --- /dev/null +++ b/.publish.sh @@ -0,0 +1,29 @@ +#!/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 From 147d6f38414710a3c1c0f3a84562b6e6b4349c64 Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:14:24 +0100 Subject: [PATCH 5/8] fix Gemfile, rm old WF --- .build.sh | 16 ------- .publish.sh | 29 ------------- Gemfile.lock | 117 ++++++++++++++++++++++++--------------------------- 3 files changed, 54 insertions(+), 108 deletions(-) delete mode 100644 .build.sh delete mode 100644 .publish.sh 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/.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 e7ea96a..614a37e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,33 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - bibtex-ruby (4.4.4) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + bibtex-ruby (4.4.7) latex-decode (~> 0.0) - citeproc (1.0.5) - namae (~> 0.8) - citeproc-ruby (1.1.7) - citeproc (>= 1.0.4, < 2.0) - csl (~> 1.4) + citeproc (1.0.10) + namae (~> 1.0) + citeproc-ruby (1.1.14) + citeproc (~> 1.0, >= 1.0.9) + csl (~> 1.6) colorator (1.1.0) - colorize (0.8.1) - csl (1.4.5) - namae (~> 0.7) - csl-styles (1.0.1.8) + csl (1.6.0) + namae (~> 1.0) + rexml + csl-styles (1.0.1.11) csl (~> 1.0) - ethon (0.10.1) - ffi (>= 1.3.0) - ffi (1.9.18) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.16.3) forwardable-extended (2.6.0) - html-proofer (3.7.4) - activesupport (>= 4.2, < 6.0) + html-proofer (3.19.1) addressable (~> 2.3) - colorize (~> 0.8) - mercenary (~> 0.3.2) - nokogiri (~> 1.7) + mercenary (~> 0.3) + nokogumbo (~> 2.0) parallel (~> 1.3) - typhoeus (~> 0.7) + rainbow (~> 3.0) + typhoeus (~> 1.3) yell (~> 2.0) - i18n (0.8.6) jekyll (3.5.1) addressable (~> 2.4) colorator (~> 1.0) @@ -46,57 +39,55 @@ GEM pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-compose (0.5.0) - jekyll (>= 3.0.0) - jekyll-feed (0.9.2) + jekyll-compose (0.9.0) + jekyll (~> 3.0) + jekyll-feed (0.11.0) jekyll (~> 3.3) jekyll-git_metadata (0.2.0) jekyll (~> 3.0) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-scholar (5.10.1) + jekyll-scholar (5.16.0) bibtex-ruby (~> 4.0, >= 4.0.13) citeproc-ruby (~> 1.0) csl-styles (~> 1.0) jekyll (~> 3.0) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.14.0) - latex-decode (0.2.2) - unicode (~> 0.4) - liquid (4.0.0) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + jekyll-watch (1.5.1) + listen (~> 3.0) + kramdown (1.17.0) + latex-decode (0.4.0) + liquid (4.0.4) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.2) - minitest (5.10.3) - namae (0.11.3) - nokogiri (1.15.3) - mini_portile2 (~> 2.8.2) + mini_portile2 (2.6.1) + namae (1.1.1) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) - parallel (1.12.0) - pathutil (0.14.0) + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) + parallel (1.23.0) + pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - racc (1.7.1) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + public_suffix (4.0.7) + racc (1.7.3) + rainbow (3.1.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.6) rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.5.1) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - thread_safe (0.3.6) - typhoeus (0.8.0) - ethon (>= 0.8.0) - tzinfo (1.2.3) - thread_safe (~> 0.1) - unicode (0.4.4.4) - yell (2.0.7) + typhoeus (1.4.1) + ethon (>= 0.9.0) + yell (2.2.2) PLATFORMS ruby @@ -111,4 +102,4 @@ DEPENDENCIES tzinfo-data BUNDLED WITH - 1.15.4 + 2.1.4 From 20941d624a16e0128ac82bfad01e64c6c7f60eca Mon Sep 17 00:00:00 2001 From: Tunc Kayikcioglu <19364610+tuncK@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:04:16 +0100 Subject: [PATCH 6/8] also trigger publication on main --- .github/workflows/merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 633999c..6b986c8 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - main jobs: build: From 3abd557a0bfe51f488a02c76059b918aae90390a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Mon, 20 Nov 2023 21:26:13 +0100 Subject: [PATCH 7/8] Update PR.yml --- .github/workflows/PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 306d281..67af6d5 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -13,4 +13,4 @@ jobs: - uses: jeffreytse/jekyll-deploy-action@v0.5.0 with: provider: 'test' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }} From 9b1217c8997ae1048b3b4295e96a916d8b7bb6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Mon, 20 Nov 2023 21:26:31 +0100 Subject: [PATCH 8/8] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6b986c8..fada568 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -17,4 +17,4 @@ jobs: with: provider: 'github' branch: 'gh-pages' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }}