Merge branch 'main' into ds/test-sourcepoint-aus

Author: dskamiotis

.github/workflows/ar-chromatic.yml

@@ -19,7 +19,7 @@ jobs:
       github.event.pull_request.user.login != 'dependabot')
     steps:
       - name: Checkout - On Pull Request
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: ${{ github.event_name == 'pull_request'}}
         with:
           fetch-depth: 0
@@ -28,7 +28,7 @@ jobs:
           # Hopefully by checking out the HEAD commit of a PR instead of the merge commit we can avoid some of those issues.
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Checkout - On Push Event
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: ${{ github.event_name == 'push'}}
         with:
           fetch-depth: 0

.github/workflows/ar-ci.yml

@@ -23,7 +23,7 @@ jobs:
 
     # Checkout the repository
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/ar-nodejs.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/build-check.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/bundle-analyser.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/container.yml

@@ -1,3 +1,5 @@
+# Commercial also use this container image for their E2E tests
+# Commercial rely on a container image built from the main branch with the tag 'main'
 on:
   workflow_call:
     outputs:
@@ -17,10 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Inject slug/short variables
-        uses: rlespinasse/[email protected]
+        uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env
@@ -39,7 +38,8 @@ jobs:
         uses: redhat-actions/[email protected]
         with:
           image: dotcom-rendering
-          tags: ${{ github.sha }} ${{ env.GITHUB_REF_SLUG }}
+          # Commercial rely on a container image built from the main branch with the tag 'main'
+          tags: ${{ github.sha }} ${{ github.ref == 'refs/heads/main' && 'main' || '' }}
           context: ./
           containerfiles: ./dotcom-rendering/Containerfile
 

.github/workflows/dcr-chromatic.yml

@@ -15,7 +15,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'run_chromatic')  ||  github.ref == 'refs/heads/main'
     steps:
       - name: Checkout - On Pull Request
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: ${{ github.event_name == 'pull_request'}}
         with:
           fetch-depth: 0
@@ -24,7 +24,7 @@ jobs:
           # Hopefully by checking out the HEAD commit of a PR instead of the merge commit we can avoid some of those issues.
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Checkout - On Push Event
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: ${{ github.event_name == 'push'}}
         with:
           fetch-depth: 0

.github/workflows/deno.yml

@@ -9,7 +9,7 @@ jobs:
     name: 🦕 Deno health
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # https://github.com/denoland/setup-deno#latest-stable-for-a-major
       - uses: denoland/setup-deno@v1

.github/workflows/jest.yml

@@ -5,7 +5,7 @@ jobs:
   jest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/lighthouse.yml

@@ -14,7 +14,7 @@ jobs:
           - 'http://localhost:9000/Front/https://www.theguardian.com/uk'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env