Skip to content

Commit

Permalink
ci: add py37, py38 image build
Browse files Browse the repository at this point in the history
  • Loading branch information
@hanxiao
hanxiao committed Jan 10, 2021
1 parent fe35bc2 commit 5e193bc
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 8 deletions.
29 changes: 25 additions & 4 deletions .github/workflows/cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,29 @@ jobs:
matrix:
include:
- tag_prefix: ""
py_suffix: ""
build_option: "--target jina_base"
py_version: "3.7"
- tag_prefix: "daemon-"
py_suffix: ""
build_option: "--target jina_daemon"
py_version: "3.7"
- tag_prefix: ""
py_suffix: "-py37"
build_option: "--target jina_base"
py_version: "3.7"
- tag_prefix: "daemon-"
py_suffix: "-py37"
build_option: "--target jina_daemon"
py_version: "3.7"
- tag_prefix: ""
py_suffix: "-py38"
build_option: "--target jina_base"
py_version: "3.8"
- tag_prefix: "daemon-"
py_suffix: "-py38"
build_option: "--target jina_daemon"
py_version: "3.8"
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -99,6 +119,7 @@ jobs:
echo "VCS_REF=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
echo "INSTALL_DEV=true" >> $GITHUB_ENV
echo "PY_VERSION=${{matrix.py_version}}" >> $GITHUB_ENV
echo "JINA_VERSION=$(sed -n '/^__version__/p' ./jina/__init__.py | cut -d \' -f2)-devel" >> $GITHUB_ENV
- name: Upload to Docker Registry
uses: elgohr/Publish-Docker-Github-Action@master
Expand All @@ -107,9 +128,9 @@ jobs:
username: ${{ secrets.DOCKERHUB_DEVBOT_USER }}
password: ${{ secrets.DOCKERHUB_DEVBOT_TOKEN }}
dockerfile: Dockerfiles/debianx.Dockerfile
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, INSTALL_DEV
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, INSTALL_DEV, PY_VERSION
buildoptions: ${{ matrix.build_option }}
tags: "${{ matrix.tag_prefix }}devel, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}"
tags: "${{ matrix.tag_prefix }}devel${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}${{matrix.py_suffix}}"
- name: Upload to Github Docker Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand All @@ -118,9 +139,9 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}
registry: docker.pkg.github.com
dockerfile: Dockerfiles/debianx.Dockerfile
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, INSTALL_DEV
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, INSTALL_DEV, PY_VERSION
buildoptions: ${{ matrix.build_option }}
tags: "${{ matrix.tag_prefix }}devel, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}"
tags: "${{ matrix.tag_prefix }}devel${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}${{matrix.py_suffix}}"

docker-build:
needs: update-doc
Expand Down
29 changes: 25 additions & 4 deletions .github/workflows/tag.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,36 @@ jobs:
matrix:
include:
- tag_prefix: ""
py_suffix: ""
build_option: "--target jina_base"
py_version: "3.7"
- tag_prefix: "daemon-"
py_suffix: ""
build_option: "--target jina_daemon"
py_version: "3.7"
- tag_prefix: ""
py_suffix: "-py37"
build_option: "--target jina_base"
py_version: "3.7"
- tag_prefix: "daemon-"
py_suffix: "-py37"
build_option: "--target jina_daemon"
py_version: "3.7"
- tag_prefix: ""
py_suffix: "-py38"
build_option: "--target jina_base"
py_version: "3.8"
- tag_prefix: "daemon-"
py_suffix: "-py38"
build_option: "--target jina_daemon"
py_version: "3.8"
steps:
- uses: actions/checkout@v2
- name: Set envs and versions
run: |
echo "VCS_REF=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
echo "PY_VERSION=${{matrix.py_version}}" >> $GITHUB_ENV
echo "JINA_VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
echo "V_JINA_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
JINA_VERSION=${GITHUB_REF/refs\/tags\/v/}
Expand All @@ -106,9 +127,9 @@ jobs:
username: ${{ secrets.DOCKERHUB_DEVBOT_USER }}
password: ${{ secrets.DOCKERHUB_DEVBOT_TOKEN }}
dockerfile: Dockerfiles/debianx.Dockerfile
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, PY_VERSION
buildoptions: ${{ matrix.build_option }}
tags: "${{ matrix.tag_prefix }}latest, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}, ${{ matrix.tag_prefix }}${{env.JINA_MINOR_VERSION}}"
tags: "${{ matrix.tag_prefix }}latest${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_MINOR_VERSION}}${{matrix.py_suffix}}"
- name: Upload to Github Docker Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
Expand All @@ -117,9 +138,9 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}
registry: docker.pkg.github.com
dockerfile: Dockerfiles/debianx.Dockerfile
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION
buildargs: BUILD_DATE, VCS_REF, JINA_VERSION, PY_VERSION
buildoptions: ${{ matrix.build_option }}
tags: "${{ matrix.tag_prefix }}latest, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}, ${{ matrix.tag_prefix }}${{env.JINA_MINOR_VERSION}}"
tags: "${{ matrix.tag_prefix }}latest${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_VERSION}}${{matrix.py_suffix}}, ${{ matrix.tag_prefix }}${{env.JINA_MINOR_VERSION}}${{matrix.py_suffix}}"

create-release:
needs: update-doc
Expand Down

0 comments on commit 5e193bc

Please sign in to comment.