From 6289389b5006bb3346677b5378ff96161d5ad18c Mon Sep 17 00:00:00 2001
From: Ramon Corrales <ramon.corrales@automattic.com>
Date: Tue, 27 Jan 2026 17:12:29 -0500
Subject: [PATCH 1/2] chore: deprecate circleci

Same as https://github.com/Automattic/newspack-plugin/pull/4413
---
 .circleci/config.yml                      | 47 -----------------------
 .github/workflows/build-and-test.yml      | 23 +++++++++++
 .github/workflows/build-distributable.yml | 14 +++++++
 .github/workflows/i18n.yml                | 14 +++++++
 .github/workflows/php.yml                 | 22 +++++++++++
 .github/workflows/release.yml             | 28 ++++++++++++++
 6 files changed, 101 insertions(+), 47 deletions(-)
 delete mode 100644 .circleci/config.yml
 create mode 100644 .github/workflows/build-and-test.yml
 create mode 100644 .github/workflows/build-distributable.yml
 create mode 100644 .github/workflows/i18n.yml
 create mode 100644 .github/workflows/php.yml
 create mode 100644 .github/workflows/release.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index c32c248..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-version: 2.1
-
-orbs:
-    newspack: newspack/newspack@1.5.8
-
-workflows:
-    version: 2
-    all:
-        jobs:
-            - newspack/build
-            - newspack/i18n:
-                  requires:
-                      - newspack/build
-                  filters:
-                      branches:
-                          only:
-                              - trunk
-            - newspack/lint-js-scss:
-                  requires:
-                      - newspack/build
-            - newspack/release:
-                  requires:
-                      - newspack/build
-                  filters:
-                      branches:
-                          only:
-                              - release
-                              - alpha
-                              - /^hotfix\/.*/
-                              - /^epic\/.*/
-            - newspack/build-distributable:
-                  requires:
-                      - newspack/build
-                      # Running this after release ensure the version number in files will be correct.
-                      - newspack/release
-                  archive-name: 'newspack-network'
-            - newspack/post-release:
-                  requires:
-                      - newspack/release
-                  filters:
-                      branches:
-                          only:
-                              - release
-    php:
-        jobs:
-            - newspack/lint-php
-            - newspack/test-php
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..f1accd7
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,23 @@
+name: Build and Test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - trunk
+      - release
+      - alpha
+      - 'hotfix/**'
+      - 'epic/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@refactor/deprecate-circle-ci
+
+  lint-js-scss:
+    needs: build
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-js-scss.yml@refactor/deprecate-circle-ci
diff --git a/.github/workflows/build-distributable.yml b/.github/workflows/build-distributable.yml
new file mode 100644
index 0000000..40f7f45
--- /dev/null
+++ b/.github/workflows/build-distributable.yml
@@ -0,0 +1,14 @@
+name: Build distributable
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-distributable:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build-distributable.yml@refactor/deprecate-circle-ci
+    with:
+      archive-name: newspack-network
diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
new file mode 100644
index 0000000..e2d4788
--- /dev/null
+++ b/.github/workflows/i18n.yml
@@ -0,0 +1,14 @@
+name: Internationalization
+
+on:
+  push:
+    branches:
+      - trunk
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  i18n:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-i18n.yml@refactor/deprecate-circle-ci
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
new file mode 100644
index 0000000..29df675
--- /dev/null
+++ b/.github/workflows/php.yml
@@ -0,0 +1,22 @@
+name: PHP
+
+on:
+  pull_request:
+  push:
+    branches:
+      - trunk
+      - release
+      - alpha
+      - 'hotfix/**'
+      - 'epic/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint-php:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-php.yml@refactor/deprecate-circle-ci
+
+  test-php:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-test-php.yml@refactor/deprecate-circle-ci
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..ba074e4
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - release
+      - alpha
+      - 'hotfix/**'
+      - 'epic/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@refactor/deprecate-circle-ci
+
+  release:
+    needs: build
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-release.yml@refactor/deprecate-circle-ci
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  post-release:
+    if: github.ref == 'refs/heads/release'
+    needs: release
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-post-release.yml@refactor/deprecate-circle-ci

From 874b8287e01b8a085461435c369956156ae078f5 Mon Sep 17 00:00:00 2001
From: Ramon Corrales <ramon.corrales@automattic.com>
Date: Fri, 30 Jan 2026 13:29:11 -0500
Subject: [PATCH 2/2] fix: point reusable workflow refs to trunk

---
 .github/workflows/build-and-test.yml      | 4 ++--
 .github/workflows/build-distributable.yml | 2 +-
 .github/workflows/i18n.yml                | 2 +-
 .github/workflows/php.yml                 | 4 ++--
 .github/workflows/release.yml             | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index f1accd7..375b63c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,8 +16,8 @@ concurrency:
 
 jobs:
   build:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@trunk
 
   lint-js-scss:
     needs: build
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-js-scss.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-js-scss.yml@trunk
diff --git a/.github/workflows/build-distributable.yml b/.github/workflows/build-distributable.yml
index 40f7f45..971f288 100644
--- a/.github/workflows/build-distributable.yml
+++ b/.github/workflows/build-distributable.yml
@@ -9,6 +9,6 @@ concurrency:
 
 jobs:
   build-distributable:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-build-distributable.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build-distributable.yml@trunk
     with:
       archive-name: newspack-network
diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
index e2d4788..b1c45ab 100644
--- a/.github/workflows/i18n.yml
+++ b/.github/workflows/i18n.yml
@@ -11,4 +11,4 @@ concurrency:
 
 jobs:
   i18n:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-i18n.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-i18n.yml@trunk
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 29df675..fd36b56 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   lint-php:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-php.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-lint-php.yml@trunk
 
   test-php:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-test-php.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-test-php.yml@trunk
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ba074e4..c3e7f0c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,15 +14,15 @@ concurrency:
 
 jobs:
   build:
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-build.yml@trunk
 
   release:
     needs: build
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-release.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-release.yml@trunk
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   post-release:
     if: github.ref == 'refs/heads/release'
     needs: release
-    uses: Automattic/newspack-scripts/.github/workflows/reusable-post-release.yml@refactor/deprecate-circle-ci
+    uses: Automattic/newspack-scripts/.github/workflows/reusable-post-release.yml@trunk