From b099dcf6303ea29dd74efe7ff16a09d7fa988826 Mon Sep 17 00:00:00 2001
From: Martin Helmich <m.helmich@mittwald.de>
Date: Thu, 22 Feb 2024 14:16:13 +0100
Subject: [PATCH] Refactor workflows for less duplication

---
 .../actions/oclif-package-action/action.yml   | 35 +++++++
 .github/workflows/release.yml                 | 92 +++----------------
 2 files changed, 48 insertions(+), 79 deletions(-)
 create mode 100644 .github/actions/oclif-package-action/action.yml

diff --git a/.github/actions/oclif-package-action/action.yml b/.github/actions/oclif-package-action/action.yml
new file mode 100644
index 00000000..1853e08c
--- /dev/null
+++ b/.github/actions/oclif-package-action/action.yml
@@ -0,0 +1,35 @@
+name: Build and package OCLIF app
+description: Build and package OCLIF app for Linux, Windows and/or macOS
+inputs:
+  target:
+    description: What to build
+    required: true
+    default: tarballs
+runs:
+  using: composite
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: "18"
+
+    - name: Install dependencies
+      shell: bash
+      run: yarn
+
+    - name: Set version in package json
+      shell: bash
+      run:
+        npm version ${GITHUB_REF#refs/tags/} --no-git-tag-version --no-workspaces-update
+
+    - name: Build
+      shell: bash
+      run: yarn compile
+
+    - name: Build packages for ${{ inputs.target }}
+      shell: bash
+      run: yarn package:${{ inputs.target }}
+      if: ${{ inputs.target != "npm" }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f2f8d1c6..43dddc9c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,29 +9,10 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Build and package
+        uses: ./.github/actions/oclif-package-action
         with:
-          node-version: "18"
-
-      - name: Install dependencies for Windows builds
-        run: sudo apt-get install -y p7zip-full nsis
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Set version in package json
-        run:
-          npm version ${GITHUB_REF#refs/tags/} --no-git-tag-version
-          --no-workspaces-update
-
-      - name: Build
-        run: yarn compile
-
-      - name: Build all possible packages
-        run: yarn package:tarballs
+          target: tarballs
 
       - name: Upload to S3
         run:
@@ -53,29 +34,13 @@ jobs:
   build-windows:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "18"
-
       - name: Install dependencies for Windows builds
         run: sudo apt-get install -y p7zip-full nsis
 
-      - name: Install dependencies
-        run: yarn
-
-      - name: Set version in package json
-        run:
-          npm version ${GITHUB_REF#refs/tags/} --no-git-tag-version
-          --no-workspaces-update
-
-      - name: Build
-        run: yarn compile
-
-      - name: Build all possible packages
-        run: yarn package:windows
+      - name: Build and package
+        uses: ./.github/actions/oclif-package-action
+        with:
+          target: windows
 
       - name: Upload to S3
         run: yarn oclif upload win
@@ -93,27 +58,10 @@ jobs:
   build-macos:
     runs-on: macos-13
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Build and package
+        uses: ./.github/actions/oclif-package-action
         with:
-          node-version: "18"
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Set version in package json
-        run:
-          npm version ${GITHUB_REF#refs/tags/} --no-git-tag-version
-          --no-workspaces-update
-
-      - name: Build
-        run: yarn compile
-
-      - name: Build all possible packages
-        run: yarn package:macos
+          target: macos
 
       - name: Upload to S3
         run: yarn oclif upload macos
@@ -135,24 +83,10 @@ jobs:
       - build-windows
       - build-macos
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Build and package
+        uses: ./.github/actions/oclif-package-action
         with:
-          node-version: "18"
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Set version in package json
-        run:
-          npm version ${GITHUB_REF#refs/tags/} --no-git-tag-version
-          --no-workspaces-update
-
-      - name: Build
-        run: yarn compile
+          target: npm
 
       - name: Publish
         run: |