Skip to content

Commit

Permalink
update ci
Browse files Browse the repository at this point in the history
  • Loading branch information
daimor committed Mar 23, 2023
1 parent 2275c59 commit 3f1818c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
jobs:
test:
strategy:
fail-fast: false
matrix:
image:
- intersystemsdc/iris-community:latest
Expand All @@ -31,7 +32,8 @@ jobs:
env:
FOLDER: /home/irisowner/sqlalchemy-iris
run: |
docker run -i --rm -v `pwd`:$FOLDER -w $FOLDER --entrypoint $FOLDER/test-in-docker.sh $IMAGE
docker build --build-arg BASE=$IMAGE -t sqlalchemy-iris
docker run -i --rm sqlalchemy-iris
deploy:
needs: test
Expand Down
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ARG BASE=intersystemsdc/iris-community
FROM $BASE

COPY --chown=irisowner:irisowner . /home/irisowner/sqlalchemy-iris

WORKDIR /home/irisowner/sqlalchemy-iris

RUN pip install -r requirements-dev.txt -r requirements-iris.txt && \
pip install -e .

ENTRYPOINT /home/irisowner/sqlalchemy-iris/test-in-docker.sh
10 changes: 0 additions & 10 deletions test-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,8 @@ exit_on_error () {
fi
}

mkdir sqlalchemy_iris.egg-info

ls -la

iris_start

pip install -r requirements-dev.txt -r requirements-iris.txt
exit_on_error

pip install -e .
exit_on_error

# Test in Network mode
python3 -m pytest
exit_on_error
Expand Down

0 comments on commit 3f1818c

Please sign in to comment.