Merge branch 'main' into include-contributor-bio-in-dcr-supported-types

Author: aracho1

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
       - run: make compile
 
       - name: upload frontend-client
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: frontend-client
           path: |
@@ -80,7 +80,7 @@ jobs:
 
       # Scala tests rely on client build assets
       - name: Download frontend-client
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: frontend-client
           path: .

.github/workflows/check-labels.yaml

@@ -6,4 +6,4 @@ on:
     types: [opened, labeled, unlabeled, synchronize, reopened, edited]
 jobs:
   require-label:
-    uses: guardian/.github/.github/workflows/require-label.yaml@4cb5024736632ffcc564b7f4b772c38b8e5ce739 #  v2.0.0
+    uses: guardian/.github/.github/workflows/require-label.yaml@d8e99387686ec439e37c883ba9bb8ab2b43a6b81 #  v3.0.0

.github/workflows/sbt-dependency-graph.yaml

@@ -19,7 +19,7 @@ jobs:
           java-version: 17
       - name: Install sbt
         id: sbt
-        uses: sbt/setup-sbt@a627500d27445f8c5021755a439829b6e78e3358 # v1.1.15
+        uses: sbt/setup-sbt@ae54f7cfe46ec0d24ade661d77f007360ab48bda # v1.1.16
       - name: Submit dependencies
         id: submit
         uses: scalacenter/sbt-dependency-submission@64084844d2b0a9b6c3765f33acde2fbe3f5ae7d3 # v3.1.0

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.10.5
+version=3.10.6
 runner.dialect = scala213
 
 maxColumn = 120

admin/app/jobs/RefreshFrontsJob.scala

@@ -13,7 +13,7 @@ object LowFrequency extends FrontType
 object StandardFrequency extends FrontType
 object HighFrequency extends FrontType {
   def highFrequencyPaths: List[String] =
-    List("uk", "us", "au", "europe", "international", "uk/sport", "us/sport", "au/sport")
+    List("uk", "us", "au", "europe", "international", "uk/sport", "us/sport", "au/sport", "sport/winter-olympics-2026")
 }
 
 case class CronUpdate(path: String, frontType: FrontType)

admin/conf/logback.xml

@@ -19,7 +19,9 @@
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <includeContext>false</includeContext>
+        </encoder>
     </appender>
 
     <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
@@ -36,6 +38,6 @@
         <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
-    <logger name="common" level="${ACCESS_LOG_LEVEL:-DEBUG}"/>
+    <logger name="common" level="${COMMON_PKG_LOG_LEVEL:-DEBUG}"/>
 
 </configuration>

applications/conf/logback.xml

@@ -16,7 +16,9 @@
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <includeContext>false</includeContext>
+        </encoder>
     </appender>
 
     <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
@@ -31,6 +33,6 @@
         <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
-    <logger name="common" level="${ACCESS_LOG_LEVEL:-DEBUG}"/>
+    <logger name="common" level="${COMMON_PKG_LOG_LEVEL:-DEBUG}"/>
 
 </configuration>

archive/conf/logback.xml

@@ -16,7 +16,9 @@
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <includeContext>false</includeContext>
+        </encoder>
     </appender>
 
     <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
@@ -31,6 +33,6 @@
         <appender-ref ref="ASYNCSTDOUT"/>
     </root>
 
-    <logger name="common" level="${ACCESS_LOG_LEVEL:-DEBUG}"/>
+    <logger name="common" level="${COMMON_PKG_LOG_LEVEL:-DEBUG}"/>
 
 </configuration>

article/app/controllers/ArticleController.scala

@@ -33,7 +33,7 @@ class ArticleController(
 
   val capiLookup: CAPILookup = new CAPILookup(contentApiClient)
 
-  private def isSupported(c: ApiContent) = c.isArticle || c.isLiveBlog || c.isSudoku
+  private def isSupported(c: ApiContent) = c.isArticle || c.isLiveBlog || c.isSudoku || c.isHosted
   override def canRender(i: ItemResponse): Boolean = i.content.exists(isSupported)
   override def renderItem(path: String)(implicit req: RequestHeader): Future[Result] =
     mapAndRender(path, GenericFallback)()

article/app/services/dotcomrendering/ArticlePicker.scala

@@ -16,7 +16,8 @@ object ArticlePageChecks {
     }
   }
 
-  def isNotAGallery(page: PageWithStoryPackage): Boolean = !page.item.tags.isGallery
+  // Treat all hosted content as non-galleries, at least during migration work
+  def isNotAGallery(page: PageWithStoryPackage): Boolean = !page.item.tags.isGallery || page.item.content.isHosted
 
   def isNotPaidContent(page: PageWithStoryPackage): Boolean = !page.item.tags.isPaidContent
 }