🐛 fix docker worfklow

This commit is contained in:
Félix Voituret
2020-07-08 17:40:57 +02:00
parent b114fd032c
commit 486460008f
2 changed files with 9 additions and 9 deletions

View File

@@ -19,12 +19,12 @@ jobs:
echo "::set-env name=base::python:${{ matrix.distribution }}" echo "::set-env name=base::python:${{ matrix.distribution }}"
echo "::set-env name=tag::${{ matrix.distribution }}" echo "::set-env name=tag::${{ matrix.distribution }}"
echo "::set-env name=file::spleeter" echo "::set-env name=file::spleeter"
- if: ${{ matrix.distribution }} == 'conda' - if: ${{ matrix.distribution == 'conda' }}
name: Build Conda base image name: Build Conda base image
run: | run: |
docker build -t python:conda -f docker/conda.dockerfile . docker build -t python:conda -f docker/conda.dockerfile .
echo "::set-env name=file::spleeter-conda" echo "::set-env name=file::spleeter-conda"
- if: ${{ matrix.platform }} == 'gpu' - if: ${{ matrix.platform == 'gpu' }}
name: Build CUDA base image name: Build CUDA base image
run: | run: |
docker build \ docker build \
@@ -42,7 +42,7 @@ jobs:
-t researchdeezer/spleeter:${{ env.tag }} \ -t researchdeezer/spleeter:${{ env.tag }} \
-f docker/${{ env.file }}.dockerfile . -f docker/${{ env.file }}.dockerfile .
echo "::set-env name=modelargs::" echo "::set-env name=modelargs::"
- if: ${{ matrix.model }} != 'modelless' - if: ${{ matrix.model != 'modelless' }}
name: Build researchdeezer/spleeter:${{ env.tag }}-${{ matrix.model }} image name: Build researchdeezer/spleeter:${{ env.tag }}-${{ matrix.model }} image
run: | run: |
docker build \ docker build \
@@ -66,12 +66,12 @@ jobs:
run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- name: Push researchdeezer/spleeter:${{ env.tag }} image - name: Push researchdeezer/spleeter:${{ env.tag }} image
run: docker push researchdeezer/spleeter:${{ env.tag }} run: docker push researchdeezer/spleeter:${{ env.tag }}
- if: ${{ env.tag }} == 'spleeter:3.7' - if: ${{ env.tag == 'spleeter:3.7' }}
name: Push researchdeezer/spleeter:latest image name: Push researchdeezer/spleeter:latest image
run: | run: |
docker tag researchdeezer/spleeter:3.7 researchdeezer/spleeter:latest docker tag researchdeezer/spleeter:3.7 researchdeezer/spleeter:latest
docker push researchdeezer/spleeter:latest docker push researchdeezer/spleeter:latest
- if: ${{ env.tag }} == 'spleeter:3.7-gpu' - if: ${{ env.tag == 'spleeter:3.7-gpu' }}
name: Push researchdeezer/spleeter:gpu image name: Push researchdeezer/spleeter:gpu image
run: | run: |
docker tag researchdeezer/spleeter:3.7-gpu researchdeezer/spleeter:gpu docker tag researchdeezer/spleeter:3.7-gpu researchdeezer/spleeter:gpu

View File

@@ -33,11 +33,11 @@ jobs:
sdist- sdist-
- name: Install dependencies - name: Install dependencies
run: pip install --upgrade pip setuptools twine run: pip install --upgrade pip setuptools twine
- name: Package CPU distribution - if: ${{ matrix.platform == 'cpu' }}
if: ${{ matrix.platform == 'cpu' }} name: Package CPU distribution
run: make build run: make build
- name: Package GPU distribution - if: ${{ matrix.platform == 'gpu' }}
if: ${{ matrix.platform == 'gpu' }} name: Package GPU distribution)
run: make build-gpu run: make build-gpu
- name: Deploy to pypi - name: Deploy to pypi
run: make deploy run: make deploy