restore gh actions

QCDIS · Jan 17, 2025 · 7ddf34c · 7ddf34c
1 parent 47f2a67
commit 7ddf34c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -57,7 +57,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - id: find-dockerfile
-        name: Find bioRad.Dockerfile
+        name: Find Dockerfile
         run: |
           # Choose the {inputs.flavor_dir}/{inputs.dockerfile} if it exists,
           # otherwise fall-back to docker/{inputs.dockerfile}
@@ -83,4 +83,4 @@ jobs:
         with:
           name: ${{ inputs.image_name }}
           path: /tmp/${{ inputs.image_name }}.tar
-          retention-days: 1
+          retention-days: 1
diff --git a/.github/workflows/make-flavor.yaml b/.github/workflows/make-flavor.yaml
@@ -29,53 +29,35 @@ on:
         required: true
 
 jobs:
-  configure-workflow:
-    name: Configure workflow
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        name: Configure skip-duplicate-actions
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          paths: '[".github/**", "docker/**", "flavors/${{ inputs.flavor_name }}/**"]'
-          do_not_skip: '["workflow_dispatch", "schedule", "release"]'
-
   build-naavre-cell-build:
     uses: ./.github/workflows/build-image.yaml
-    needs: configure-workflow
     with:
-      dockerfile: naavre-cell-build.bioRad.Dockerfile
+      dockerfile: naavre-cell-build.Dockerfile
       flavor_dir: './flavors/${{ inputs.flavor_name }}'
       image_name: naavre-cell-build-${{ inputs.flavor_name }}
       image_repo: ${{ inputs.image_repo }}
       image_version: ${{ inputs.image_version }}
-    if: ${{ needs.configure-workflow.outputs.should_skip != 'true' }}
 
   build-naavre-cell-runtime:
     uses: ./.github/workflows/build-image.yaml
-    needs: configure-workflow
     with:
-      dockerfile: naavre-cell-runtime.bioRad.Dockerfile
+      dockerfile: naavre-cell-runtime.Dockerfile
       flavor_dir: './flavors/${{ inputs.flavor_name }}'
       image_name: naavre-cell-runtime-${{ inputs.flavor_name }}
       image_repo: ${{ inputs.image_repo }}
       image_version: ${{ inputs.image_version }}
-    if: ${{ needs.configure-workflow.outputs.should_skip != 'true' }}
 
   build-naavre-jupyter:
     uses: ./.github/workflows/build-image.yaml
-    needs: configure-workflow
     with:
-      dockerfile: naavre-jupyter.bioRad.Dockerfile
+      dockerfile: naavre-jupyter.Dockerfile
       flavor_dir: './flavors/${{ inputs.flavor_name }}'
       image_name: naavre-jupyter-${{ inputs.flavor_name }}
       image_repo: ${{ inputs.image_repo }}
       image_version: ${{ inputs.naavre_version }}-${{ inputs.image_version }}
       naavre_version: ${{ inputs.naavre_version }}
       free_disk_space: ${{ inputs.free_disk_space }}
-    if: ${{ inputs.build_jupyter && needs.configure-workflow.outputs.should_skip != 'true'}}
+    if: ${{ inputs.build_jupyter }}
 
   test:
     uses: ./.github/workflows/test-naavre-cell.yaml
@@ -109,4 +91,4 @@ jobs:
       image_name: naavre-jupyter-${{ inputs.flavor_name }}
       image_repo: ${{ inputs.image_repo }}
       free_disk_space: ${{ inputs.free_disk_space }}
-    if: ${{ github.event_name == 'release' && inputs.build_jupyter }}
+    if: ${{ github.event_name == 'release' && inputs.build_jupyter }}