Merge pull request #95 from danielfromearth/develop

update `main`
nasa · Mar 21, 2024 · 8c4af1a · 8c4af1a
2 parents 473aab8 + df36874
commit 8c4af1a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -102,17 +102,15 @@ jobs:
         echo "venue=ops" >> $GITHUB_ENV
 
     - name: Log in to the Container registry
-      # TODO: change this and subsequent docker steps back to NOT (as follows), after testing in the feature branch --- if: ${{ !startsWith(github.ref, 'refs/heads/feature') }}
-      if: ${{ startsWith(github.ref, 'refs/heads/feature/') }}
+      if: ${{ !startsWith(github.ref, 'refs/heads/feature/') }}
       uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker
-#      if: ${{ !startsWith(github.ref, 'refs/heads/feature') }}
-      if: ${{ startsWith(github.ref, 'refs/heads/feature/') }}
+      if: ${{ !startsWith(github.ref, 'refs/heads/feature/') }}
       id: meta
       uses: docker/metadata-action@v5
       with:
@@ -129,8 +127,7 @@ jobs:
 #        ${GITHUB_WORKSPACE}/.github/workflows/wait-for-pypi.py ${{env.pyproject_name}}[harmony]==${{ env.software_version }}
 
     - name: Build and push Docker image
-#      if: ${{ !startsWith(github.ref, 'refs/heads/feature') }}
-      if: ${{ startsWith(github.ref, 'refs/heads/feature/') }}
+      if: ${{ !startsWith(github.ref, 'refs/heads/feature/') }}
       id: docker-push
       uses: docker/build-push-action@v5
       with: