Merge branch 'main' into cicd-remove-hardcoded-org-name

stac-utils · Feb 10, 2025 · 639a8eb · 639a8eb
2 parents 6759981 + 38e14a0
commit 639a8eb
Show file tree

Hide file tree

Showing 11 changed files with 5,037 additions and 22 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -40,15 +40,15 @@ jobs:
           [[ "${{ steps.filter.outputs.pgstac }}" == "true" ]] && buildpg=true || ref=main;
           echo "pgtag=${{ env.REGISTRY }}/${GITHUB_REPOSITORY_OWNER}/pgstac-postgres:$ref" >>$GITHUB_OUTPUT;
           echo "buildpg=$buildpg" >>$GITHUB_OUTPUT;
-          buildy=false;
+          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;
 
   # This builds a base postgres image that has everything installed to be able to run pgstac. This image does not have pgstac itself installed.
   buildpg:
     name: Build and push base postgres image
-    if: ${{ needs.changes.outputs.buildpgdocker == 'true' }}
     runs-on: ubuntu-latest
     needs: [changes]
     steps:
@@ -61,6 +61,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push Base Postgres
+        if: ${{ needs.changes.outputs.buildpgdocker == 'true' }}
         uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64,linux/arm64
@@ -74,7 +75,6 @@ jobs:
 
   buildpyrust:
     name: Build and push base pyrust
-    if: ${{ needs.changes.outputs.buildpyrustdocker == 'true' }}
     runs-on: ubuntu-latest
     needs: [changes]
     steps:
@@ -87,6 +87,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push Base pyrust
+        if: ${{ needs.changes.outputs.buildpyrustdocker == 'true' }}
         uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64,linux/arm64

diff --git a/docker/pypgstac/bin/stageversion b/docker/pypgstac/bin/stageversion
@@ -45,7 +45,7 @@ cp migrations/pgstac.${VERSION}.sql pgstac.sql
 # Update the version number in the appropriate places
 [[ $VERSION == 'unreleased' ]] && PYVERSION="${OLDVERSION}-dev" || PYVERSION="$VERSION"
 echo "Setting pypgstac version to $PYVERSION"
-cat <<EOD > $PYPGSTACDIR/python/pypgstac/version.py
+cat <<EOD > $PYPGSTACDIR/src/pypgstac/version.py
 """Version."""
 __version__ = "${PYVERSION}"
 EOD