From 8c731c24b9a4f933b167f6f0e6dba6a185ba839a Mon Sep 17 00:00:00 2001
From: Jakub Recman <jakub@oxidian.com>
Date: Thu, 20 Mar 2025 14:37:19 +0100
Subject: [PATCH 1/2] Switch actions org from ecmwf-actions to ecmwf

---
 .github/workflows/ci.yaml             | 2 +-
 .github/workflows/label-public-pr.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a1d0869..5423fb5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
     name: downstream-ci
     if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
     # FIXME: revert to main when ready
-    uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@add-conflator
+    uses: ecmwf/downstream-ci/.github/workflows/downstream-ci.yml@add-conflator
     with:
       conflator: ecmwf/conflator@${{ github.event.pull_request.head.sha || github.sha }}
       codecov_upload: true
diff --git a/.github/workflows/label-public-pr.yml b/.github/workflows/label-public-pr.yml
index 52f3b87..1baa87b 100644
--- a/.github/workflows/label-public-pr.yml
+++ b/.github/workflows/label-public-pr.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   label:
-    uses: ecmwf-actions/reusable-workflows/.github/workflows/label-pr.yml@v2
\ No newline at end of file
+    uses: ecmwf/reusable-workflows/.github/workflows/label-pr.yml@v2
\ No newline at end of file

From 699fb767811fdd75e3fc20a65c8fe1e37b2d42a4 Mon Sep 17 00:00:00 2001
From: Oisin-M <60450429+Oisin-M@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:19:15 +0000
Subject: [PATCH 2/2] fix: change downstream ci to use main branch

---
 .github/workflows/ci.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a1d0869..5acdfe8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,8 +19,7 @@ jobs:
   downstream-ci:
     name: downstream-ci
     if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
-    # FIXME: revert to main when ready
-    uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@add-conflator
+    uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
     with:
       conflator: ecmwf/conflator@${{ github.event.pull_request.head.sha || github.sha }}
       codecov_upload: true
@@ -159,4 +158,4 @@ jobs:
           PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           poetry build
-          poetry publish --username=$PYPI_USERNAME --password=$PYPI_PASSWORD
\ No newline at end of file
+          poetry publish --username=$PYPI_USERNAME --password=$PYPI_PASSWORD