ci: Refinements to build workflows (still failing)

xchem · Nov 11, 2023 · c87dacf · c87dacf
1 parent d80bea6
commit c87dacf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 61 deletions.
diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml
@@ -44,7 +44,7 @@ env:
   BE_NAMESPACE: xchem
 
 jobs:
-  prepare:
+  build:
     runs-on: ubuntu-latest
     outputs:
       push: ${{ steps.vars.outputs.push }}
@@ -84,20 +84,6 @@ jobs:
         pip install --upgrade pip
         pip install poetry==1.7.0
         poetry export --without-hashes --without dev --output requirements.txt
-    - name: Upload compiled requirements
-      uses: actions/upload-artifact@v3
-      with:
-        name: requirements
-        path: requirements.txt
-
-  build-and-push:
-    needs: prepare
-    runs-on: ubuntu-latest
-    steps:
-    - name: Download requirements
-      uses: actions/download-artifact@v3
-      with:
-        name: requirements
     - name: Docker build
       uses: docker/build-push-action@v4
       with:
@@ -115,11 +101,11 @@ jobs:
 #        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
 #        BE_TAG: ${{ env.GITHUB_REF_SLUG }}
     - name: Login to DockerHub
-      if: ${{needs.prepare.outputs.push}} == 'true'
+      if: steps.vars.outputs.push == 'true'
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Push
-      if: ${{needs.prepare.outputs.push}} == 'true'
+      if: steps.vars.outputs.push == 'true'
       run: docker push ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ env.GITHUB_REF_SLUG }}
diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -49,32 +49,7 @@ env:
   STACK_NAMESPACE: xchem
 
 jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Lint Dockerfile
-      uses: hadolint/[email protected]
-      with:
-        dockerfile: Dockerfile
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.11'
-    - name: Compile requirements.txt
-      run: |
-        pip install --upgrade pip
-        pip install poetry==1.7.0
-        poetry export --without-hashes --without dev --output requirements.txt
-    - name: Upload compiled requirements
-      uses: actions/upload-artifact@v3
-      with:
-        name: requirements
-        path: requirements.txt
-
-  build-and-push:
-    needs: prepare
+  build:
     runs-on: ubuntu-latest
     outputs:
       push: ${{ steps.vars.outputs.push }}
@@ -138,10 +113,21 @@ jobs:
         # Do we trigger downstream, i.e. is TRIGGER_DOWNSTREAM 'yes'?
         echo trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}
         echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT
-    - name: Download requirements
-      uses: actions/download-artifact@v3
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Lint Dockerfile
+      uses: hadolint/[email protected]
+      with:
+        dockerfile: Dockerfile
+    - name: Set up Python
+      uses: actions/setup-python@v3
       with:
-        name: requirements
+        python-version: '3.11'
+    - name: Compile requirements.txt
+      run: |
+        pip install --upgrade pip
+        pip install poetry==1.7.0
+        poetry export --without-hashes --without dev --output requirements.txt
     - name: Build
       uses: docker/build-push-action@v4
       with:
@@ -150,20 +136,20 @@ jobs:
           ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ steps.vars.outputs.tag }}
           ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:stable
 #    - name: Test
-      run: >
-        docker-compose -f docker-compose.test.yml up
-        --build
-        --exit-code-from tests
-        --abort-on-container-exit
-      env:
-        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
-        BE_TAG: ${{ steps.vars.outputs.tag }}
-#    - name: Login to DockerHub
-#      if: steps.vars.outputs.push == 'true'
-#      uses: docker/login-action@v2
-#      with:
-#        username: ${{ secrets.DOCKERHUB_USERNAME }}
-#        password: ${{ secrets.DOCKERHUB_TOKEN }}
+#      run: >
+#        docker-compose -f docker-compose.test.yml up
+#        --build
+#        --exit-code-from tests
+#        --abort-on-container-exit
+#      env:
+#        BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }}
+#        BE_TAG: ${{ steps.vars.outputs.tag }}
+    - name: Login to DockerHub
+      if: steps.vars.outputs.push == 'true'
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Push
       if: steps.vars.outputs.push == 'true'
       run: |

diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
@@ -166,7 +166,7 @@ jobs:
 #        BE_TAG: ${{ steps.vars.outputs.tag }}
     - name: Login to DockerHub
       if: steps.vars.outputs.push == 'true'
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}