Reduce number of CI workflow files by supporting input tags for docke…

…r image
ComputationalPhysiology · May 13, 2024 · 53e9cb7 · 53e9cb7
1 parent 5493cde
commit 53e9cb7
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 47 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -24,9 +24,13 @@ concurrency:
 jobs:
   build-docs:
     uses: ./.github/workflows/docs.yml
+    with: 
+      tag: "stable"
 
   run-tests:
-    uses: ./.github/workflows/test_stable.yml
+    uses: ./.github/workflows/tests.yml
+    with: 
+      tag: "stable"
 
   deploy:
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,15 +6,30 @@ on:
       - main
 
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag of DOLFINx docker image'
+        default: 'nightly'
+        required: true
+        type: string
   workflow_call:
+    inputs:
+      tag:
+        description: 'Tag of DOLFINx docker image'
+        default: 'nightly'
+        required: true
+        type: string
 
 env:
   DEB_PYTHON_INSTALL_LAYOUT: deb_system
 
 jobs:
   build:
     runs-on: ubuntu-22.04
-    container: ghcr.io/fenics/dolfinx/dolfinx:stable
+    env: 
+      DEFAULT_TAG: nightly
+      DEB_PYTHON_INSTALL_LAYOUT: deb_system    
+    container: ghcr.io/fenics/dolfinx/dolfinx:${{ inputs.tag || github.env.DEFAULT_TAG }}
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,24 +1,38 @@
-name: Test package against nightly image
-
+name: Test OASISx against DOLFINx (docker)
 on:
   push:
     branches:
       - main
   workflow_call:
+    inputs:
+      tag:
+        description: 'Tag of DOLFINx docker image'
+        default: 'nightly'
+        required: true
+        type: string
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag of DOLFINx docker image'
+        default: 'nightly'
+        required: true
+        type: string
+
   pull_request:
     branches:
       - main
   schedule:
     - cron: "0 8 * * *"
 
-env:
-  DEB_PYTHON_INSTALL_LAYOUT: deb_system
 
 jobs:
   tests:
     runs-on: ubuntu-22.04
-    container: ghcr.io/fenics/dolfinx/dolfinx:nightly
+    env: 
+      DEFAULT_TAG: nightly
+      DEB_PYTHON_INSTALL_LAYOUT: deb_system
+
+    container: ghcr.io/fenics/dolfinx/dolfinx:${{ inputs.tag || github.env.DEFAULT_TAG }}
 
     steps:
       - uses: actions/checkout@v4