Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
bitner committed Oct 31, 2024
1 parent 417af63 commit d58ccd7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
28 changes: 12 additions & 16 deletions .github/workflows/civ2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,15 @@ jobs:
needs: [check-pgstac-base, check-pypgstac-base, buildpg, buildpypgstacbase, wheels]
if: ${{ always() && !failure() && !cancelled() }}
runs-on: ubuntu-latest
container: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
env:
PGHOST: localhost
PGUSER: postgres
PGPASSWORD: postgres
PGDATABASE: postgres
container:
image: ghcr.io/stac-utils/pypgstac-base:${{ needs.check-pypgstac-base.outputs.pypgstac-image-hash }}
env:
PGHOST: localhost
PGUSER: postgres
PGPASSWORD: postgres
PGDATABASE: postgres
volumes:
- $GITHUB_WORKSPACE:/opt/src/
services:
pg:
image: ghcr.io/stac-utils/pgstac-base:${{ needs.check-pgstac-base.outputs.pgstac-image-hash }}
Expand All @@ -171,24 +174,17 @@ jobs:
with:
name: wheels
path: /tmp/wheels
- name: Check paths
run: |
ls $GITHUB_WORKSPACE
- name: Install pypgstac
run: |
cd $GITHUB_WORKSPACE/src/pypgstac
pwd
ls
source $UV_PROJECT_ENVIRONMENT/bin/activate
source /venv/bin/activate
uv pip install --offline --find-links /tmp/wheels pypgstac
- name: Run tests
run: |
cd $GITHUB_WORKSPACE
pwd
ls
echo $UV_PROJECT_ENVIRONMENT
source $UV_PROJECT_ENVIRONMENT/bin/activate
./scripts/test
source /venv/bin/activate
/scripts/test
# linux_x86_64:
# runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions docker/pypgstac/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ RUN \
&& apt-get clean && apt-get -y autoremove \
&& uv sync --frozen --no-install-project --extra test --extra dev --extra migrations --extra psycopg \
&& uv pip install setuptools
COPY ./docker/pypgstac/bin /scripts


# slim image for running pypgstac
Expand Down

0 comments on commit d58ccd7

Please sign in to comment.