From 675998125caf71313b2a4de52ffa95f4b139b9d3 Mon Sep 17 00:00:00 2001
From: Vincent Privat <vincent.privat@airbus.com>
Date: Tue, 17 Dec 2024 16:03:59 +0100
Subject: [PATCH 1/2] Replace hardcoded org name by ${GITHUB_REPOSITORY_OWNER}

---
 .github/workflows/continuous-integration.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 57237ca7..cb88d66d 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -38,11 +38,11 @@ jobs:
           buildpg=false;
           ref=$(echo ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} | tr / _);
           [[ "${{ steps.filter.outputs.pgstac }}" == "true" ]] && buildpg=true || ref=main;
-          echo "pgtag=${{ env.REGISTRY }}/stac-utils/pgstac-postgres:$ref" >>$GITHUB_OUTPUT;
+          echo "pgtag=${{ env.REGISTRY }}/${GITHUB_REPOSITORY_OWNER}/pgstac-postgres:$ref" >>$GITHUB_OUTPUT;
           echo "buildpg=$buildpg" >>$GITHUB_OUTPUT;
           buildy=false;
           [[ "${{ steps.filter.outputs.pypgstac }}" == "true" ]] && buildpy=true || ref=main;
-          echo "pytag=${{ env.REGISTRY }}/stac-utils/pgstac-pyrust:$ref" >>$GITHUB_OUTPUT;
+          echo "pytag=${{ env.REGISTRY }}/${GITHUB_REPOSITORY_OWNER}/pgstac-pyrust:$ref" >>$GITHUB_OUTPUT;
           echo "buildpy=$buildpg" >>$GITHUB_OUTPUT;
 
   # This builds a base postgres image that has everything installed to be able to run pgstac. This image does not have pgstac itself installed.

From 9eeb4a1ca016a6ffb813658f580707e052b23618 Mon Sep 17 00:00:00 2001
From: David Bitner <bitner@dbspatial.com>
Date: Mon, 10 Feb 2025 12:16:08 -0600
Subject: [PATCH 2/2] fix bad merge

---
 .github/workflows/continuous-integration.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e5a6c3aa..2d486c50 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -42,7 +42,6 @@ jobs:
           echo "buildpg=$buildpg" >>$GITHUB_OUTPUT;
           buildpy=false;
           [[ "${{ steps.filter.outputs.pypgstac }}" == "true" ]] && buildpy=true || ref=main;
-          cicd-remove-hardcoded-org-name
           echo "pytag=${{ env.REGISTRY }}/${GITHUB_REPOSITORY_OWNER}/pgstac-pyrust:$ref" >>$GITHUB_OUTPUT;
           echo "buildpy=$buildpg" >>$GITHUB_OUTPUT;