Merge pull request #38 from gerlero/ci

.github/workflows/ci.yml

@@ -4,19 +4,19 @@ on:
   push:
     branches:
       - main
-    tags:
-      - 'v*'
   pull_request:
-    branches: 
+    branches:
       - main
+  workflow_call:
+    inputs:
+      app-version:
+        type: string
+        required: true
 
 jobs:
   build:
     runs-on: macos-latest
     steps:
-      - name: Get version number
-        id: get_version
-        uses: battila7/get-version-action@v2
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache DMG file
@@ -33,12 +33,12 @@ jobs:
           touch build/*.dmg
       - name: Build
         run: |
-          make zip APP_VERSION=${{ steps.get_version.outputs.version-without-v }}
+          make zip APP_VERSION=${{ inputs.app-version }}
       - name: Upload ZIP artifact
         uses: actions/upload-artifact@v3
         with:
-          name: zip-${{ runner.arch }}
-          path: build/*.zip
+          name: zip
+          path: build/*-app-*.zip
           if-no-files-found: error
 
   test:
@@ -54,31 +54,13 @@ jobs:
       - name: Download ZIP artifact
         uses: actions/download-artifact@v3
         with:
-          name: zip-${{ runner.arch }}
+          name: zip
           path: build
       - name: Unzip app
         run: |
-          unzip *.zip
+          unzip *-app-$(uname -m).zip
         working-directory: build
       - name: Test
         run: |
           make install-dependencies
           make test
-  
-  release:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download ZIP artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: zip-${{ runner.arch }}
-      - name: Upload ZIP to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: '*.zip'
-          tag: ${{ github.ref }}
-          file_glob: true
-          overwrite: true

.github/workflows/release.yml

@@ -0,0 +1,39 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  get-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.version-without-v }}
+    steps:
+      - name: Get version number
+        id: get_version
+        uses: battila7/get-version-action@v2
+
+  build:
+    needs: get-version
+    uses: ./.github/workflows/ci.yml
+    with:
+      app-version: needs.get-version.outputs.version
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download ZIP artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: zip
+      - name: Upload ZIP to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: '*.zip'
+          tag: ${{ github.ref }}
+          file_glob: true
+          overwrite: true

README.md

@@ -4,7 +4,7 @@
 
 **Native OpenFOAM v2112 as a Mac app**, with binaries compiled from the [OpenFOAM source code](https://develop.openfoam.com/Development/openfoam/-/blob/master/doc/Build.md). Intel and Apple silicon variants.
 
-[![CI](https://github.com/gerlero/openfoam2112-app/actions/workflows/ci.yml/badge.svg)](https://github.com/gerlero/openfoam2112-app/actions/workflows/ci.yml) [![homebrew cask](https://img.shields.io/badge/homebrew%20cask-gerlero%2Fopenfoam%2Fopenfoam2112-informational)](https://github.com/gerlero/homebrew-openfoam) ![GitHub all releases](https://img.shields.io/github/downloads/gerlero/openfoam2112-app/total)
+[![CI](https://github.com/gerlero/openfoam2112-app/actions/workflows/ci.yml/badge.svg)](https://github.com/gerlero/openfoam2112-app/actions/workflows/ci.yml) [![Release](https://github.com/gerlero/openfoam2112-app/actions/workflows/release.yml/badge.svg)](https://github.com/gerlero/openfoam2112-app/actions/workflows/release.yml) [![homebrew cask](https://img.shields.io/badge/homebrew%20cask-gerlero%2Fopenfoam%2Fopenfoam2112-informational)](https://github.com/gerlero/homebrew-openfoam) ![GitHub all releases](https://img.shields.io/github/downloads/gerlero/openfoam2112-app/total)
 
 ## ⬇️ Install