From ed170b3d7a7f678199e5afcc61ec8bafa4248b8b Mon Sep 17 00:00:00 2001 From: Graeme A Stewart Date: Fri, 31 Jan 2025 09:06:31 +0100 Subject: [PATCH 1/5] Tables fixup Also, test netlify setup --- organization/_posts/2024/2024-06-24-steering.md | 1 + organization/_posts/2024/2024-09-23-steering.md | 1 + organization/_posts/2024/2024-10-14-steering.md | 1 + organization/_posts/2024/2024-11-19-steering.md | 1 + organization/_posts/2025/2025-01-13-steering.md | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/organization/_posts/2024/2024-06-24-steering.md b/organization/_posts/2024/2024-06-24-steering.md index ebd19b606..d9b4c76aa 100644 --- a/organization/_posts/2024/2024-06-24-steering.md +++ b/organization/_posts/2024/2024-06-24-steering.md @@ -38,6 +38,7 @@ ACTION: Comments need to be closed. The following roles have been taken on by SG members so far: +{:.table .table-hover .table-condensed .table-striped} | Role | SG Member(s) | |------|--------------| | SG Chair | Graeme | diff --git a/organization/_posts/2024/2024-09-23-steering.md b/organization/_posts/2024/2024-09-23-steering.md index 640b477e5..a5090284d 100644 --- a/organization/_posts/2024/2024-09-23-steering.md +++ b/organization/_posts/2024/2024-09-23-steering.md @@ -13,6 +13,7 @@ Apologies: Liz Sexton-Kennedy, Nicole Skidmore, Paul Laycock, Torre Wenaus Any discussions to report on? +{:.table .table-hover .table-condensed .table-striped} | Activity | SG Responsible | Met? | | ------------------------------------ | --------------- | ------------ | | Data Analysis | Eduardo + Mark | | diff --git a/organization/_posts/2024/2024-10-14-steering.md b/organization/_posts/2024/2024-10-14-steering.md index ca5493790..07f65ebde 100644 --- a/organization/_posts/2024/2024-10-14-steering.md +++ b/organization/_posts/2024/2024-10-14-steering.md @@ -13,6 +13,7 @@ Apologies: Andrea Valassi, Paul Laycock Any discussions to report on? +{:.table .table-hover .table-condensed .table-striped} | Activity | SG Responsible | Met? | | ------------------------------------ | --------------- | ------------ | | Data Analysis | Eduardo + Mark | Not yet | diff --git a/organization/_posts/2024/2024-11-19-steering.md b/organization/_posts/2024/2024-11-19-steering.md index 20e581fd8..0f3412e71 100644 --- a/organization/_posts/2024/2024-11-19-steering.md +++ b/organization/_posts/2024/2024-11-19-steering.md @@ -27,6 +27,7 @@ Good discussion with Mike Kirby from DUNE about increasing their HSF involvement ## Activity Areas +{:.table .table-hover .table-condensed .table-striped} | Activity | SG Responsible | Met? | | ------------------------------------ | --------------- | ------------ | | Data Analysis | Eduardo + Mark | Y (Graeme+Michel) | diff --git a/organization/_posts/2025/2025-01-13-steering.md b/organization/_posts/2025/2025-01-13-steering.md index ef4437dd2..c2350e122 100644 --- a/organization/_posts/2025/2025-01-13-steering.md +++ b/organization/_posts/2025/2025-01-13-steering.md @@ -35,8 +35,9 @@ How PyHEP uses HSF conveners needs discussion. Is it just the workshop organisat Once conveners for 2025 are settled we should all discuss again with our relevant activities for their plans. -Are people happy with their responsibility assignments? +Are people happy with their responsibility assignments? +{:.table .table-hover .table-condensed .table-striped} | Activity | SG Responsible | Met? | | ------------------------------------ | --------------- | ------------ | | Data Analysis | Eduardo + Mark | | From e21e3e645c90e4b61fb6be5b45a3456a5137ced5 Mon Sep 17 00:00:00 2001 From: Graeme A Stewart Date: Fri, 31 Jan 2025 09:20:58 +0100 Subject: [PATCH 2/5] Fix build and deploy action --- .github/workflows/build-and-deploy.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 0eabb7c22..933632ef4 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -16,22 +16,20 @@ jobs: steps: - name: Checkout source uses: actions/checkout@v4 - - name: Setup node.js - uses: actions/setup-node@v4 + - name: Setup Ruby + uses: actions/setup-ruby@v1 with: - node-version: 21 - - name: Install node dependencies - run: npm install - - name: Build site + ruby-version: 3.2 + - name: Install dependencies run: | - PREFIX_PATHS=true npm run build - mkdir website - mv public website/training-center - cp redirect.html website/index.html - - name: Upload artifact + gem install bundler + bundle install + - name: Build site + run: bundle exec jekyll build + - name: Upload artifacts uses: actions/upload-pages-artifact@v3 with: - path: ./website + path: ./_site deploy: if: github.event_name == 'push' needs: build From b0b56fccf591e016850b95e4751b1be6080e2741 Mon Sep 17 00:00:00 2001 From: Graeme A Stewart Date: Fri, 31 Jan 2025 09:24:45 +0100 Subject: [PATCH 3/5] Fix ruby version --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 937f6a0ed..230b88ee6 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,5 +5,5 @@ publish = "_site" command = "bundler exec jekyll build" [build.environment] -RUBY_VERSION=3.2.6 +RUBY_VERSION=3.2 NODE_VERSION=21.X From 5dc40199b9d096c6cd04e8b6fae2f59cf258ff57 Mon Sep 17 00:00:00 2001 From: Graeme A Stewart Date: Fri, 31 Jan 2025 09:26:09 +0100 Subject: [PATCH 4/5] Remove node version --- netlify.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 230b88ee6..21f6174dd 100644 --- a/netlify.toml +++ b/netlify.toml @@ -6,4 +6,3 @@ command = "bundler exec jekyll build" [build.environment] RUBY_VERSION=3.2 -NODE_VERSION=21.X From 240dfe46c8b19aa59566cca20c049b5ebd44cd07 Mon Sep 17 00:00:00 2001 From: Graeme A Stewart Date: Fri, 31 Jan 2025 09:31:26 +0100 Subject: [PATCH 5/5] Ruby version as string --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 21f6174dd..153fc49d7 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,4 +5,4 @@ publish = "_site" command = "bundler exec jekyll build" [build.environment] -RUBY_VERSION=3.2 +RUBY_VERSION="3.2"