Merge pull request #247 from gerlero/actions

Update Release workflow
gerlero · Feb 9, 2024 · c70efcc · c70efcc
2 parents 24133d7 + 2b74d56
commit c70efcc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,11 @@ on:
       - main
   schedule:
     - cron: '0 6 * * 5'
+  workflow_call:
+    inputs:
+      app-version:
+        type: string
+        required: true
   workflow_dispatch:
     inputs:
       use-cached:
@@ -40,8 +45,9 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/build-test.yml
     with:
-      openfoam-version: ${{ matrix.openfoam-version }}
       build-os: ${{ matrix.build-os }}
+      openfoam-version: ${{ matrix.openfoam-version }}
+      app-version: ${{ github.event_name == 'workflow_call' && inputs.app-version || '' }}
       deps-kind: ${{ inputs.deps-kind }}
       use-cached: ${{ github.event_name == 'workflow_dispatch' && inputs.use-cached || github.event_name != 'workflow_dispatch' && github.event_name != 'schedule' }}
       cache-build: ${{ github.event_name != 'workflow_dispatch' && inputs.cache-build || github.event_name != 'workflow_dispatch' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,15 +18,8 @@ jobs:
 
   build:
     needs: get-version
-    strategy:
-      matrix:
-        build-os: [macos-14, macos-12]
-        openfoam-version: [2312, 2306]
-      fail-fast: false
-    uses: ./.github/workflows/build-test.yml
+    uses: ./.github/workflows/ci.yml
     with:
-      openfoam-version: ${{ matrix.openfoam-version }}
-      build-os: ${{ matrix.build-os }}
       app-version: ${{ needs.get-version.outputs.app-version }}
 
   release: