Merge branch 'main' into main

.github/workflows/ci-main.yml

@@ -15,12 +15,17 @@ on:
       - 'learning-pathways/*'
       - 'faqs/**'
       - 'news/**'
+      - 'events/**'
+      - CONTRIBUTORS.yaml
+      - FUNDERS.yaml
+      - ORGANISATIONS.yaml
+
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -29,14 +34,14 @@ jobs:
           reviewdog_version: latest
 
       # BEGIN Dependencies
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           architecture: 'x64'
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
-      - uses: actions/cache@v2
+          ruby-version: "3.2"
+      - uses: actions/cache@v4
         with:
           path: |
             vendor/bundle
@@ -45,7 +50,7 @@ jobs:
             ${{ runner.os }}-gems-
       - name: Install dependencies
         run: |
-          gem install bundler rubocop
+          gem install bundler
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           pip install pyyaml
@@ -66,10 +71,10 @@ jobs:
         env:
             REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: rubocop
-        uses: reviewdog/action-rubocop@v2
-        with:
-          rubocop_version: gemfile
-          reporter: github-pr-review
-          rubocop_flags: --except Layout/LineLength,Lint/RedundantCopDisableDirective
-          fail_on_error: true
+      # - name: rubocop
+      #   uses: reviewdog/action-rubocop@v2
+      #   with:
+      #     rubocop_version: gemfile
+      #     reporter: github-pr-review
+      #     rubocop_flags: --except Layout/LineLength,Lint/RedundantCopDisableDirective
+      #     fail_on_error: true

.github/workflows/ci.yml

@@ -25,42 +25,35 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       # BEGIN Dependencies
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           architecture: 'x64'
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '19'
-      - uses: actions/cache@v2
+          ruby-version: "3.2"
+      - uses: actions/cache@v4
         with:
           path: |
             vendor/bundle
-            ~/.npm
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-
           restore-keys: |
-            ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-node-
             ${{ runner.os }}-gems-
       - name: Install dependencies
         run: |
-          sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config # for node
           gem install bundler
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-          npm install
           bundle pristine ffi
       # END Dependencies
 
-      - name: Build the site
-        run: bundle exec jekyll build --strict_front_matter -d _site/training-material --trace
+      - name: Ensure that the site builds
+        run: bundle exec jekyll build --strict_front_matter -d _site/training-material --trace --future
 
       - name: Validate all links, enforce alt text
         run: |
@@ -72,36 +65,22 @@ jobs:
             --enforce-https=false \
             ./_site
 
-      - name: Ensure no unexpected encoded HTML in output
+      - name: Ensure no unexpected encoded HTML in output, ask a GTN contributor for help with this one.
         run: |
           ! fgrep -R 'lt;blockquote' _site
 
+      - name: Ensure no poorly rendered FAQs, generally this is fixed by removing whitespace/blank lines from the frontmatter
+        run: |
+          ! fgrep -R -A2 -B2 'box_type:' _site/
+
       - name: Ensure no poorly indented code blocks
         run: |
           bundle exec ruby bin/check-indent.rb
 
-      - name: Ensure no unexpected jekyll in output
+      - name: Ensure no unexpected jekyll in output. If this fails, generally it means you should add a page.description to the front matter.
         run: |
           ! fgrep -R 'site.pages' _site
 
-      - name: Run aXe accessibility testing on some representative URLs
-        run: |
-          node_modules/.bin/http-server _site/ &
-          # We can focus AND scroll these regions. I thus disable their violation warning.
-          # Twitter isn't our fault. Sorry.
-          node_modules/.bin/axe --disable scrollable-region-focusable --exclude '#twitter-widget-0' --chromedriver-path /usr/bin/chromedriver \
-            http://localhost:8080/training-material/ \
-            http://localhost:8080/training-material/hall-of-fame/ \
-            http://localhost:8080/training-material/hall-of-fame/hexylena/ \
-            http://localhost:8080/training-material/topics/introduction/ \
-            http://localhost:8080/training-material/topics/statistics/ \
-            http://localhost:8080/training-material/topics/genome-annotation/ \
-            http://localhost:8080/training-material/topics/admin/ \
-            http://localhost:8080/training-material/topics/dev/ \
-            http://localhost:8080/training-material/topics/introduction/tutorials/galaxy-intro-short/tutorial.html \
-            http://localhost:8080/training-material/topics/introduction/tutorials/galaxy-intro-short/workflows/ \
-            http://localhost:8080/training-material/topics/admin/tutorials/ansible-galaxy/tutorial.html
-
       - name: Validate notebooks (If this fails, ask @hexylena to look at your notebook)
         run: |
           find _site | grep ipynb | xargs bundle exec ruby bin/check-valid-notebook.rb

.github/workflows/cron-commit-cache.yml

@@ -12,15 +12,15 @@ jobs:
       (github.event_name != 'pull_request' ||
        github.event.pull_request.head.repo.full_name == github.repository)
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1000
 
       # BEGIN Dependencies
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
-      - uses: actions/cache@v2
+          ruby-version: "3.2"
+      - uses: actions/cache@v4
         with:
           path: |
             vendor/bundle
@@ -49,11 +49,16 @@ jobs:
 
           bundle exec ruby bin/commit-cache-update.rb
 
+      - name: Update geocoding of events
+        id: geocode
+        run: |
+          bundle exec ruby bin/geocode.rb
+
       - name: Create Pull Request
         # If it's not a Pull Request then commit any changes as a new PR.
         uses: peter-evans/create-pull-request@v3
         with:
           title: Update Cached Commit Data
-          branch-suffix: commitcache
+          branch-suffix: timestamp
           commit-message: Update Cached Commit Data
-          add-paths: metadata/
+          add-paths: metadata/,events/

.github/workflows/deploy.yml

@@ -1,5 +1,9 @@
 name: Deploy Website
 
+concurrency:
+  group: deploy-${{ github.head_ref }}
+  cancel-in-progress: false # Not sure about this.
+
 on:
   push:
     branches:
@@ -14,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'galaxyproject'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Avg commits between successive monday:
           #  Min.   :  2.0
@@ -26,17 +30,17 @@ jobs:
           fetch-depth: 400
 
       # BEGIN Dependencies
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           architecture: 'x64'
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
-      - uses: actions/setup-node@v2
+          ruby-version: "3.2"
+      - uses: actions/setup-node@v4
         with:
           node-version: '19'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             vendor/bundle
@@ -66,8 +70,6 @@ jobs:
           npm install
           make rebuild-search-index ACTIVATE_ENV=pwd
           cat metadata/swagger.yaml | python bin/yaml2json.py > api/swagger.json
-          curl --retry 5 https://gallantries.github.io/video-library/api/videos.json > metadata/video-library.json
-          curl --retry 5 https://gallantries.github.io/video-library/api/sessions.json > metadata/session-library.json
           rdoc bin _plugins/ --output gtn_rdoc
 
       - name: Build Site