diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 1cb0b59..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Docker Image CI - -on: - release: - types: [published] - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Docker login - env: - DOCKER_USER: ${{secrets.DOCKER_USER}} - DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} - run: | - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - - name: Build the Docker image - run: docker build . --file releng/Dockerfile --tag aiplanning/planutils:latest - - name: Docker Push - run: docker push aiplanning/planutils:latest diff --git a/.github/workflows/python-publish.yml b/.github/workflows/release.yml similarity index 53% rename from .github/workflows/python-publish.yml rename to .github/workflows/release.yml index 3bfabfc..efadcd9 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/release.yml @@ -1,18 +1,11 @@ -# This workflow will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -name: Upload Python Package +name: Release on: release: types: [published] jobs: + deploy: runs-on: ubuntu-latest @@ -34,3 +27,22 @@ jobs: with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} + + build: + + runs-on: ubuntu-latest + + needs: deploy + + steps: + - uses: actions/checkout@v2 + - name: Docker login + env: + DOCKER_USER: ${{secrets.DOCKER_USER}} + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + run: | + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + - name: Build the Docker image + run: docker build . --file releng/Dockerfile --tag aiplanning/planutils:latest + - name: Docker Push + run: docker push aiplanning/planutils:latest