Skip to content

Commit 224a228

Browse files
Use better defaults.
1 parent 896cf56 commit 224a228

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/development.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '!gh-pages' # exclude gh-pages branch
77
- '!stage*' # exclude branches beginning with stage
88
tags:
9-
- '[0-9]+\.[0-9]+\.[0-9]+'
9+
- '\d+\.\d+\.\d+'
1010
pull_request:
1111
branches:
1212
- '**' # every branch
@@ -18,7 +18,7 @@ jobs:
1818
matrix:
1919
include:
2020
- py_ver: 3.8
21-
distro: alpine
21+
distro: debian
2222
image: djbase
2323
env:
2424
PY_VER: ${{matrix.py_ver}}
@@ -34,7 +34,7 @@ jobs:
3434
export HOST_UID=$(id -u)
3535
docker-compose -f docker-compose-build.yaml up --exit-code-from app --build
3636
echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
37-
- if: matrix.py_ver == '3.8' && matrix.distro == 'alpine'
37+
- if: matrix.py_ver == '3.8' && matrix.distro == 'debian'
3838
name: Add pip artifacts
3939
uses: actions/upload-artifact@v2
4040
with:
@@ -95,7 +95,7 @@ jobs:
9595
run: |
9696
export MODE=BUILD
9797
export PACKAGE=datajoint
98-
export UPSTREAM_REPO=https://github.com/datajoint/datajoint-python.git
98+
export UPSTREAM_REPO=https://github.com/${GITHUB_REPOSITORY}.git
9999
export HOST_UID=$(id -u)
100100
docker compose -f docs/docker-compose.yaml up --exit-code-from docs --build
101101
git push origin gh-pages

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG PY_VER
2-
ARG DISTRO
3-
ARG IMAGE
1+
ARG PY_VER=3.8
2+
ARG DISTRO=debian
3+
ARG IMAGE=djbase
44
FROM datajoint/${IMAGE}:py${PY_VER}-${DISTRO}
55
WORKDIR /main
66
COPY --chown=anaconda:anaconda ./requirements.txt ./setup.py \

0 commit comments

Comments
 (0)