From 4cd1e318bce030dd6b02cd35daae74778fb8bfdf Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 25 Apr 2024 11:18:09 +0200
Subject: [PATCH 1/5] CI updates

---
 .github/workflows/publish.yml | 10 +++++-----
 .github/workflows/test.yml    | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 06a92e17..0d32c8b2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: publish
+name: Publish
 
 on: [push]
 
@@ -6,7 +6,7 @@ jobs:
   sphinx:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Install Requirements
@@ -20,9 +20,9 @@ jobs:
       run: |
         cd build
         git init
-        git config user.name "Key4hep bot"
-        git config user.email "Key4hep.bot@example.com"
-        git remote add upstream https://vvolkl:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
+        git config user.name "FCCSW Bot"
+        git config user.email "fccsw.bot@example.com"
+        git remote add upstream https://kjvbrt:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
 
         touch .nojekyll
         git add .nojekyll
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9d7e6733..effebd97 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: linux
+name: Test
 
 on: [push, pull_request]
 
@@ -8,21 +8,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        SETUP: ['/cvmfs/sw.hsf.org/key4hep/setup.sh', '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh']
+        STACK: ['/cvmfs/sw.hsf.org/key4hep/setup.sh',
+                '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh']
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
+    - uses: actions/checkout@v4
+    - uses: cvmfs-contrib/github-action-cvmfs@v4
     - name: Start container
       run: |
-        docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: RunTests
+        docker run -it \
+                   --name CI_container \
+                   -v ${GITHUB_WORKSPACE}:/Package \
+                   -v /cvmfs:/cvmfs:shared \
+                   -d ghcr.io/key4hep/key4hep-images/alma9:latest /bin/bash
+    - name: Run tests
       run: |
         docker exec CI_container /bin/bash -c \
         'curl -LO https://github.com/jgm/pandoc/releases/download/2.18/pandoc-2.18-linux-amd64.tar.gz;\
         tar -xzf pandoc-2.18-linux-amd64.tar.gz;\
         cp pandoc-2.18/bin/pandoc /usr/local/bin/;\
         cd ./Package;\
-        source ${{ matrix.SETUP }};\
+        source ${{ matrix.STACK }};\
         mkdir build;\
         cd build;\
         cmake ..;\

From d61421c76feadc7b73ea0499aa3a8c3d383e2dfe Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 25 Apr 2024 11:24:56 +0200
Subject: [PATCH 2/5] Remove if

---
 .github/workflows/publish.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0d32c8b2..80c72b9e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,6 +1,10 @@
 name: Publish
 
-on: [push]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   sphinx:
@@ -16,7 +20,6 @@ jobs:
       run: |
         sphinx-multiversion . build
     - name: Publish gh-pages
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       run: |
         cd build
         git init

From eaaec809bd686a5fa5fd9fab64a6d1407a3bd940 Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 25 Apr 2024 11:33:35 +0200
Subject: [PATCH 3/5] Publish only on master

---
 .github/workflows/publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 80c72b9e..646a067b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,8 +3,7 @@ name: Publish
 on:
   push:
     branches:
-    - master
-  pull_request:
+    - ci_updates
 
 jobs:
   sphinx:

From dc5b2b9a0c791c5e79861daae174668138706f08 Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 25 Apr 2024 11:42:53 +0200
Subject: [PATCH 4/5] Updating requirements.txt

---
 requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f9a25c69..03f56464 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-Sphinx==5.3.0
-myst-parser==0.18.1
-sphinx-rtd-theme==1.0.0
+Sphinx==7.3.7
+myst-parser==3.0.0
+sphinx-rtd-theme==2.0.0
 sphinx-togglebutton==0.3.2
-sphinx-copybutton==0.5.0
+sphinx-copybutton==0.5.2
 sphinx-multiversion==0.2.4

From ec01ecafa48956ee7dc4ca153f257caa95cd7bbe Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <juraj.smiesko@cern.ch>
Date: Thu, 25 Apr 2024 12:02:01 +0200
Subject: [PATCH 5/5] Publish only on main

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 646a067b..d9d3c1ab 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     branches:
-    - ci_updates
+    - main
 
 jobs:
   sphinx: