Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev.wfh upload #4908

Merged
merged 37 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4fad053
Final implementation details for ro-crate posting
hexylena Apr 22, 2024
d9696c1
whatever
hexylena Jun 23, 2024
418a1d0
Implement upload
hexylena Apr 22, 2024
31f7b56
use better separable folders
hexylena Apr 22, 2024
14cdb9f
add wfh uploader
hexylena Apr 22, 2024
9e5ace1
better script
hexylena Apr 22, 2024
30a0aa9
formatting
hexylena Apr 22, 2024
1f38e89
parallelise
hexylena Apr 22, 2024
8ae6eb8
save yaml
hexylena Apr 22, 2024
e969800
add pngs to crates
hexylena Apr 23, 2024
d2b8ff7
aesthetic improvements
hexylena Apr 24, 2024
ab89b2a
mostly working ro-crate?
hexylena Jun 23, 2024
ed422d2
closer to release
hexylena Jun 23, 2024
71c484a
note why
hexylena Jun 23, 2024
3f90aaa
start permissions work
hexylena Jun 24, 2024
73a6e82
hmm
hexylena Jun 24, 2024
346bced
better handling around permissions
hexylena Jun 24, 2024
2551112
Merge branch 'main' into coydog-powan
hexylena Jun 24, 2024
5fff1ef
document why
hexylena Jun 24, 2024
be225b4
add ROR ids
hexylena Jun 24, 2024
2067e4c
wip per-wf page
hexylena Jun 24, 2024
893a987
more annotations
hexylena Jun 24, 2024
533beb1
add shortlinks for WFs
hexylena Jun 24, 2024
8e352a6
workflow version history
hexylena Jun 24, 2024
0508f29
Fix admin training bug
hexylena Jun 24, 2024
a769436
shortlinks for wf pages
hexylena Jun 24, 2024
8feaff6
fix how the upload works
hexylena Jun 24, 2024
cb89afd
add tool_dir for examples
hexylena Jun 24, 2024
19260c0
conditionally show buttons
hexylena Jun 24, 2024
2a25d30
finalise our IDs
hexylena Jun 24, 2024
ff92205
would add dupes
hexylena Jun 24, 2024
59322c2
Fix og:image for slides
hexylena Jun 24, 2024
8c05121
add discussion links conditionally
hexylena Jun 24, 2024
2300d15
Add common problem
hexylena Jun 24, 2024
def751e
move to fair section
hexylena Jun 24, 2024
b1909e2
expose ror
hexylena Jun 24, 2024
c916faf
Review from Sas
hexylena Jun 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .github/workflows/workflowhub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: "[Cron] Upload workflows to (DEV)WorkflowHub"

on:
schedule:
# * is a special character in YAML so you have to quote this string
# We'll run this daily at noon.
- cron: '59 12 * * *'
workflow_dispatch:

jobs:
runner-job:
if: github.repository_owner == 'galaxyproject'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 200

# BEGIN Dependencies
- uses: actions/setup-python@v2
with:
python-version: '3.11'
architecture: 'x64'
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"
- uses: actions/cache@v2
with:
path: |
vendor/bundle
~/.npm
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-
${{ runner.os }}-gems-
- name: Install dependencies
run: |
gem install bundler
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
bundle pristine ffi
# END Dependencies

# Required to build the RO-Crates
- name: Build Site
run: |
JEKYLL_ENV=production bundle exec jekyll build --strict_front_matter -d _site/training-material

- name: Upload workflows
run: |
python bin/wfh-upload.py
env:
DEV_WFH_TOKEN: ${{ secrets.DEV_WFH_TOKEN }}
30 changes: 28 additions & 2 deletions ORGANISATIONS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,41 @@ avans-atgm:
joined: 2020-11
url: https://avans.nl
avatar: "/training-material/shared/images/logo-avans.png"
ror: "015d5s513"

carpentries:
name: The Carpentries
joined: 2021-09
ror: "0356fgm10"

earlham:
name: Earlham Institute
joined: 2017-09
url: https://www.earlham.ac.uk/
avatar: "/training-material/shared/images/earlham_logo.svg"
ror: "018cxtf62"

edctp:
name: EDCTP
description: The European & Developing Countries Clinical Trials Partnership
url: https://www.edctp.org/
avatar: "/training-material/shared/images/edctp.jpg"
github: false
ror: "031jv9v19"

egi:
name: EGI
url: https://www.egi.eu/
avatar: https://cdn.egi.eu/app/uploads/2021/11/egi-logo.svg
github: false
ror: "052jj4m32"

elixir-europe:
name: ELIXIR Europe
joined: 2017-09
url: https://elixir-europe.org
avatar: "/training-material/shared/images/elixir.png"
ror: "044rwnt51"

elixir-goblet-ttt:
name: ELIXIR Goblet Train the Trainers
Expand All @@ -61,43 +67,50 @@ embl-ebi:
url: https://www.ebi.ac.uk
avatar: https://raw.githubusercontent.com/nomadscientist/scrnaseq_training/d0fccaa9dc8dc8615eb7146d6c5e96bd36f11f3a/EMBL_EBI_Logo_black.svg
github: false
ror: "02catss52"

erasmusmc:
name: ErasmusMC
description: Erasmus Medical Center
url: https://www.erasmusmc.nl
avatar: "/training-material/shared/images/logo-erasmusmc.png"
github: false
ror: "018906e22"

eu:
name: The European Union
url: https://european-union.europa.eu
avatar: "/training-material/shared/images/EU-logo.jpg"
github: false
ror: "019w4f821"

find:
name: FIND
description: The Foundation for Innovative New Diagnostics
url: https://www.finddx.org/
avatar: "/training-material/shared/images/FIND.png"
github: false
ror: "05tcsqz68"

ifb:
name: Institut Français de Bioinformatique
url: https://www.france-bioinformatique.fr/
avatar: "/training-material/shared/images/ifb.png"
github: false
ror: "045f7pv37"

inab-certh:
name: INAB|CERTH
url: "https://www.inab.certh.gr/"
avatar: "/training-material/shared/images/inab-certh.png"
ror: "03bndpq63"

irccs:
name: IRCCS Ospedale San Raffaele
url: "https://www.hsr.it/"
avatar: "/training-material/shared/images/irccs.jpg"
github: false
ror: "039zxt351"

jetstream2:
name: JetStream
Expand All @@ -110,6 +123,7 @@ johnshopkins:
url: "https://www.jhu.edu/"
avatar: "/training-material/shared/images/hopkins.png"
github: false
ror: "00za53h95"

linq:
name: LINQ
Expand All @@ -123,17 +137,20 @@ minnesotauni:
url: "https://twin-cities.umn.edu/"
avatar: "/training-material/shared/images/minnesotauni.png"
github: false
ror: "017zqws13"

MPIIE:
name: Max Planck Institute of Immunology and Epigenetics
url: https://www.ie-freiburg.mpg.de
avatar: https://raw.githubusercontent.com/bgruening/presentations/master/shared/resources/img/14_MPI_IE_logo_mit_180.gif
github: false
ror: "058xzat49"

ncbi:
name: National Center for Biotechnology Information
url: "https://www.ncbi.nlm.nih.gov/"
avatar: "/training-material/shared/images/ncbi.png"
ror: "02meqm098"

panacea:
name: PanACEA
Expand All @@ -153,6 +170,7 @@ petermac:
name: Peter MacCallum Cancer Centre
url: "https://www.petermac.org/"
avatar: "/training-material/shared/images/petermac.png"
ror: "02a8bt934"

pndb:
name: Pôle National de Données de Biodiversité
Expand All @@ -165,36 +183,42 @@ psu:
url: http://www.psu.edu
avatar: "/training-material/shared/images/psu.png"
github: false
ror: "04p491231"

qiime2:
name: QIIME2
url: https://qiime2.org/
avatar: https://avatars.githubusercontent.com/u/18176583?s=200&v=4


sanbi:
name: SANBI/UWC
url: https://www.sanbi.org/
avatar: "/training-material/shared/images/sanbi.png"
description: "South African National Bioinformatics Institute, University of the Western Cape"
github: false
ror: "005r3tp02"

san-raffaele-uni:
name: Università Vita-Salute San Raffaele
url: "https://www.unisr.it/"
avatar: "/training-material/shared/images/uni_san_raffaele.svg"
github: false
ror: "01gmqr298"

sciensano:
name: Sciensano
url: "https://www.sciensano.be"
avatar: "/training-material/shared/images/sciensano.jpg"
github: false
ror: "04ejags36"

swiss-tph:
name: Swiss Tropical and Public Health Institute
url: https://www.swisstph.ch/en/
avatar: "/training-material/shared/images/swiss-tph.png"
github: false
ror: "03adhka07"

tb-capt:
name: TB-CAPT
Expand All @@ -207,23 +231,25 @@ uga:
url: https://www.univ-grenoble-alpes.fr/
avatar: /training-material/shared/images/logo-uga.svg
github: false
ror: "02rx3b187"

uni-freiburg:
name: University of Freiburg
url: https://www.uni-freiburg.de/
avatar: https://raw.githubusercontent.com/bgruening/presentations/a2e38e4b007994af798320db3a0131c4bb891c0e/shared/resources/img/logo_freiburg.jpg
github: false
ror: "0245cg223"

UTas:
name: University of Tasmania
url: https://www.utas.edu.au/
avatar: "/training-material/shared/images/UTas_logo.png"
github: false
ror: "01nfmeh72"

vib:
name: Vlaams Instituut voor Biotechnologie
url: https://vib.be/
avatar: "/training-material/shared/images/logo-vib.png"
github: false


ror: "03xrhmk39"
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ icon-tag:
galaxy-tags: fas fa-tags
galaxy-toggle: fas fa-toggle-on
galaxy-upload: fas fa-upload
galaxy-download: fas fa-download
galaxy-wf-connection: fas fa-arrows-alt-h
galaxy-wf-edit: fa fa-edit
galaxy-wf-new: fas fa-plus
Expand Down
4 changes: 2 additions & 2 deletions _layouts/base_slides.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
{%- elsif page.tags contains "galaxy" %}{% assign coverimage = "/assets/images/GalaxyNews.png" %}
{%- elsif page.tags contains "gat" %}{% assign coverimage = "/assets/images/gat.png" %}
{%- else %}{% assign coverimage = "/assets/images/GTNLogo1000.png" %}{% endif %}
{% assign og_image = page.og_image | default: coverimage | default: topic.og_image | default: "/assets/images/GTNLogo1000.png" %}
<meta property="og:image" content="{{ og_image | prepend: site.baseurl }}">
{% assign og_image = page.og_image | default: page['cover-image'] | default: topic.og_image | default: coverimage | default: "assets/images/GTNLogo1000.png" %}
<meta property="og:image" content="{% if og_image contains 'https://' %}{{ og_image }}{% else %}{{ site.url }}{{ site.baseurl }}/{{ og_image }}{% endif %}">

<script type="application/ld+json">
{% include _includes/material.jsonld material=page topic=topic site=site %}
Expand Down
8 changes: 8 additions & 0 deletions _layouts/contributor_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,14 @@ <h2>External Links</h2>
</div>
{% endif %}

{% if entity.ror %}
<div class="contact-items">
<a title="ROR" href="https://ror.org/{{ entity.ror }}">
ROR:{{ entity.ror }}
</a>
</div>
{% endif %}

{% if entity.github != false %}
<div class="contact-items">
<a title="GitHub" href="https://github.com/{{ page.contributor }}">
Expand Down
Loading
Loading