Merge branch 'main' into filter/carousel-card

Author: charleycampbell

.github/CODEOWNERS

@@ -7,7 +7,6 @@
 /.github/                                       @guardian/dotcom-platform
 /.husky/                                        @guardian/dotcom-platform
 /.vscode/                                       @guardian/dotcom-platform
-/apps-rendering/                                @guardian/dotcom-platform
 
 # Files at the root of `/dotcom-rendering`
 /dotcom-rendering/*                             @guardian/dotcom-platform

.github/workflows/build-check.yml

@@ -2,7 +2,6 @@ name: DCR Build Check
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'dotcom-rendering/docs/**'
 
 jobs:

.github/workflows/bundle-analyser.yml

@@ -2,7 +2,6 @@ name: DCR Bundle Analyser
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'dotcom-rendering/docs/**'
 jobs:
   build_check:

.github/workflows/cicd.yml

@@ -3,7 +3,6 @@ name: DCR CICD
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'ab-testing/**'
       - '!ab-testing/config/abTests.ts'
 

.github/workflows/delete-old-packages.yml

@@ -25,3 +25,4 @@ jobs:
           package-name: 'dotcom-rendering'
           package-type: 'container'
           min-versions-to-keep: ${{ env.NUM_OF_VERSIONS_TO_KEEP }}
+          ignore-versions: main

.github/workflows/schema-check.yml

@@ -2,7 +2,6 @@ name: DCR Schema Check
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'dotcom-rendering/docs/**'
 
 jobs:

.github/workflows/stories-check.yml

@@ -2,7 +2,6 @@ name: DCR Stories Check
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'dotcom-rendering/docs/**'
 
 jobs:

.github/workflows/typescript.yml

@@ -2,7 +2,6 @@ name: DCR typescript 🕵‍♀
 on:
   push:
     paths-ignore:
-      - 'apps-rendering/**'
       - 'dotcom-rendering/docs/**'
 
 jobs:

CONTRIBUTING.md

@@ -1,7 +1,5 @@
-# Welcome to the the Guardian's Apps & Web rendering platforms
+# Welcome to the Guardian's Apps & Web rendering platform
 
 Read our [Code of conduct](./CODE_OF_CONDUCT.md) to help keep things approachable and respectful.
 
-Interested in our web rendering platform? [Start here ➡️](./dotcom-rendering/docs/contributing/README.md)
-
-Interested in our apps rendering platform? [Start here ➡️](./apps-rendering/README.md)
+[Start here ➡️](./dotcom-rendering/docs/contributing/README.md)

README.md

@@ -1,22 +1,14 @@
-# Dotcom Rendering & Apps Rendering
+# DCAR: Dotcom & Apps Rendering
 
 This repository contains the rendering logic for theguardian.com and for a subset of articles in the live apps.
 
-It is a monorepo with 2 projects, `apps-rendering` and `dotcom-rendering`.
-
 ## Run
 
-### `apps rendering`
-
-Go to [apps rendering](apps-rendering/README.md) for more details.
-
-### `dotcom rendering`
-
 Go to [dotcom rendering](dotcom-rendering/README.md) for more details.
 
 ## Root actions
 
-Most commands are run from within each project but the following can be run from the root:
+Most commands are run from within the dotcom-rendering project but the following can be run from the root:
 
 ### Storybook