Merge pull request #180 from gerlero/makefile

Handle OpenFOAM patch level in Makefile
gerlero · Jul 5, 2023 · fe13d2d · fe13d2d
2 parents b1ce8e0 + 883dc73
commit fe13d2d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,17 +32,10 @@ jobs:
     strategy:
       matrix:
         openfoam-version: [2306, 2212, 2206, 2112]
-        include:
-          - openfoam-version: 2306
-          - openfoam-version: 2212
-            openfoam-tarball-url: https://dl.openfoam.com/source/v2212/OpenFOAM-v2212_230612.tgz
-          - openfoam-version: 2112
-            openfoam-tarball-url: https://dl.openfoam.com/source/v2112/OpenFOAM-v2112_220610.tgz
       fail-fast: false
     uses: ./.github/workflows/build-test.yml
     with:
       openfoam-version: ${{ matrix.openfoam-version }}
-      openfoam-tarball-url: ${{ matrix.openfoam-tarball-url }}
       build-os: ${{ inputs.build-os }}
       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
@@ -21,16 +21,9 @@ jobs:
     strategy:
       matrix:
         openfoam-version: [2306, 2212, 2206, 2112]
-        include:
-          - openfoam-version: 2306
-          - openfoam-version: 2212
-            openfoam-tarball-url: https://dl.openfoam.com/source/v2212/OpenFOAM-v2212_230612.tgz
-          - openfoam-version: 2112
-            openfoam-tarball-url: https://dl.openfoam.com/source/v2112/OpenFOAM-v2112_220610.tgz
       fail-fast: false
     uses: ./.github/workflows/build-test.yml
     with:
       openfoam-version: ${{ matrix.openfoam-version }}
-      openfoam-tarball-url: ${{ matrix.openfoam-tarball-url }}
       app-version: ${{ needs.get-version.outputs.app-version }}
       release: true
diff --git a/Makefile b/Makefile
@@ -2,7 +2,16 @@
 SHELL = /bin/zsh
 OPENFOAM_VERSION = 2306
 APP_NAME = OpenFOAM-v$(OPENFOAM_VERSION)
-OPENFOAM_TARBALL_URL = https://dl.openfoam.com/source/v$(OPENFOAM_VERSION)/OpenFOAM-v$(OPENFOAM_VERSION).tgz
+
+ifeq ($(OPENFOAM_VERSION),2112)
+OPENFOAM_PATCH_LEVEL = 220610
+else ifeq ($(OPENFOAM_VERSION),2212)
+OPENFOAM_PATCH_LEVEL = 230612
+else
+OPENFOAM_PATCH_LEVEL = 0
+endif
+
+OPENFOAM_TARBALL_URL = https://dl.openfoam.com/source/v$(OPENFOAM_VERSION)/OpenFOAM-v$(OPENFOAM_VERSION)$(if $(filter-out 0, $(OPENFOAM_PATCH_LEVEL)),_$(OPENFOAM_PATCH_LEVEL)).tgz
 OPENFOAM_GIT_REPO_URL = https://develop.openfoam.com/Development/openfoam.git
 OPENFOAM_GIT_BRANCH =
 VOLUME_FILESYSTEM = 'Case-sensitive APFS'