Skip to content

Commit

Permalink
Merge branch 'master' into patient
Browse files Browse the repository at this point in the history
  • Loading branch information
bgruening authored Nov 20, 2023
2 parents 65c04ba + f60fa57 commit 75c8874
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 48 deletions.
16 changes: 0 additions & 16 deletions .build.sh

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
provider: 'test'
token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }}
20 changes: 20 additions & 0 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
provider: 'github'
branch: 'gh-pages'
token: ${{ secrets.JEKYLL_DEPLOY_TOKEN }}
29 changes: 0 additions & 29 deletions .publish.sh

This file was deleted.

2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 75c8874

Please sign in to comment.