Corrected update-version job. Used the incorrect path when

catting the values files
xcube-dev · Sep 15, 2021 · 85c85d5 · 85c85d5
1 parent 56e10a8
commit 85c85d5
Showing 1 changed file with 74 additions and 74 deletions.
diff --git a/.github/workflows/xcube_workflow.yaml b/.github/workflows/xcube_workflow.yaml
@@ -6,85 +6,85 @@ on:
     types: [published]
 
 jobs:
-#  unittest:
-#    runs-on: ubuntu-latest
-#    env:
-#      NUMBA_DISABLE_JIT: 1
-#    steps:
-#      - uses: actions/checkout@v2
-#      # Setup miniconda nd build env
-#      - uses: conda-incubator/setup-miniconda@v2
-#        with:
-#          mamba-version: "*"
-#          channels: conda-forge
-#          activate-environment: xcube
-#          environment-file: environment.yml
-#      # Setup xcube
-#      - name: setup-xcube
-#        shell: bash -l {0}
-#        run: |
-#          conda info
-#          conda list
-#          python setup.py develop
-#      # Run unittests
-#      - name: unittest-xcube
-#        shell: bash -l {0}
-#        run: |
-#          pip install pytest pytest-cov
-#          mamba install -c conda-forge  flask-testing moto requests-mock
-#
-#          pytest --cov=./ --cov-report=xml
-#      - uses: codecov/codecov-action@v1
-#        with:
-#          verbose: true # optional (default = false)
-#  build-docker-image:
-#    runs-on: ubuntu-latest
-#    # Only run if unittests succeed
-#    needs: unittest
-#    # Build the docker image and push to quay.io
-#    name: build-docker-image
-#    env:
-#      APP_NAME: xcube
-#      ORG_NAME: bcdev
-#    steps:
-#      - name: git-checkout
-#        uses: actions/checkout@v2
-#      # Strip the release tag from refs
-#      - name: get-release-tag
-#        id: release
-#        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-#      # Print some info
-#      - name: info
-#        id: info
-#        run: |
-#          echo "TAG: ${{ steps.release.outputs.tag }}"
-#          echo "EVENT: ${{ github.event_name }}"
-#      # Build and push docker image 'latest' to quay.io when the event is a 'push' and branch 'master'
-#      - uses: mr-smithers-excellent/docker-build-push@v5
-#        name: build-push-docker-image-latest
-#        if: ${{ github.event_name == 'push' && steps.release.outputs.tag == 'master'  }}
-#        with:
-#          image: ${{ env.ORG_NAME }}/${{ env.APP_NAME }}
-#          tags: master, latest
-#          registry: quay.io
-#          username: ${{ secrets.QUAY_DOCKER_REPO_USERNAME }}
-#          password: ${{ secrets.QUAY_DOCKER_REPO_PASSWORD }}
-#      # Build and push docker release to quay.io when the event is a 'release'
-#      - uses: mr-smithers-excellent/docker-build-push@v5
-#        name: build-push-docker-image-release
-#        if: ${{ github.event_name == 'release' }}
-#        with:
-#          image: ${{ env.ORG_NAME }}/${{ env.APP_NAME }}
-#          tags: ${{ steps.release.outputs.tag }}
-#          registry: quay.io
-#          username: ${{ secrets.QUAY_DOCKER_REPO_USERNAME }}
-#          password: ${{ secrets.QUAY_DOCKER_REPO_PASSWORD }}
+  unittest:
+    runs-on: ubuntu-latest
+    env:
+      NUMBA_DISABLE_JIT: 1
+    steps:
+      - uses: actions/checkout@v2
+      # Setup miniconda nd build env
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          mamba-version: "*"
+          channels: conda-forge
+          activate-environment: xcube
+          environment-file: environment.yml
+      # Setup xcube
+      - name: setup-xcube
+        shell: bash -l {0}
+        run: |
+          conda info
+          conda list
+          python setup.py develop
+      # Run unittests
+      - name: unittest-xcube
+        shell: bash -l {0}
+        run: |
+          pip install pytest pytest-cov
+          mamba install -c conda-forge  flask-testing moto requests-mock
+
+          pytest --cov=./ --cov-report=xml
+      - uses: codecov/codecov-action@v1
+        with:
+          verbose: true # optional (default = false)
+  build-docker-image:
+    runs-on: ubuntu-latest
+    # Only run if unittests succeed
+    needs: unittest
+    # Build the docker image and push to quay.io
+    name: build-docker-image
+    env:
+      APP_NAME: xcube
+      ORG_NAME: bcdev
+    steps:
+      - name: git-checkout
+        uses: actions/checkout@v2
+      # Strip the release tag from refs
+      - name: get-release-tag
+        id: release
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+      # Print some info
+      - name: info
+        id: info
+        run: |
+          echo "TAG: ${{ steps.release.outputs.tag }}"
+          echo "EVENT: ${{ github.event_name }}"
+      # Build and push docker image 'latest' to quay.io when the event is a 'push' and branch 'master'
+      - uses: mr-smithers-excellent/docker-build-push@v5
+        name: build-push-docker-image-latest
+        if: ${{ github.event_name == 'push' && steps.release.outputs.tag == 'master'  }}
+        with:
+          image: ${{ env.ORG_NAME }}/${{ env.APP_NAME }}
+          tags: master, latest
+          registry: quay.io
+          username: ${{ secrets.QUAY_DOCKER_REPO_USERNAME }}
+          password: ${{ secrets.QUAY_DOCKER_REPO_PASSWORD }}
+      # Build and push docker release to quay.io when the event is a 'release'
+      - uses: mr-smithers-excellent/docker-build-push@v5
+        name: build-push-docker-image-release
+        if: ${{ github.event_name == 'release' }}
+        with:
+          image: ${{ env.ORG_NAME }}/${{ env.APP_NAME }}
+          tags: ${{ steps.release.outputs.tag }}
+          registry: quay.io
+          username: ${{ secrets.QUAY_DOCKER_REPO_USERNAME }}
+          password: ${{ secrets.QUAY_DOCKER_REPO_PASSWORD }}
   update-version:
     env:
       PUSH: 0
       APP_NAME: xcube
     runs-on: ubuntu-latest
-#    needs: build-docker-image
+    needs: build-docker-image
     name: update-tag
     steps:
       - name: git-checkout