From 17c1241928dbb2cd6ab9700db40332891ef3d78b Mon Sep 17 00:00:00 2001
From: Yoann Potinet <yoann.potinet@frozenstorminteractive.com>
Date: Fri, 17 Nov 2023 18:01:12 -0500
Subject: [PATCH] refactor CI workflows

---
 .github/workflows/build-package.yml | 56 +++++++++++++++++++++++++++++
 .github/workflows/main.yml          | 45 ++++-------------------
 2 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/build-package.yml

diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
new file mode 100644
index 0000000..900dac6
--- /dev/null
+++ b/.github/workflows/build-package.yml
@@ -0,0 +1,56 @@
+on:
+  workflow_call:
+    inputs:
+      P4D_VERSION:
+        required: true
+        type: string
+      DSM_VERSION:
+        required: true
+        type: string
+      SPK_PLATFORM:
+          required: true
+          type: string
+      SPK_ARCH:
+        required: true
+        type: string
+
+jobs:
+  build:
+    name: Build Package
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - id: setup_toolchain
+        name: Setup Toolchain
+        run: |
+          sudo -E ./.ci/setup-toolchain.sh
+        env:
+          DSM_VERSION: ${{ inputs.DSM_VERSION }}
+          SPK_PLATFORM: ${{ inputs.SPK_PLATFORM }}
+
+      - id: build_package
+        name: Build Package
+        run: |
+          sudo -E ./.ci/build-package.sh
+        env:
+          DSM_VERSION: ${{ inputs.DSM_VERSION }}
+          SPK_PLATFORM: ${{ inputs.SPK_PLATFORM }}
+          SPK_ARCH: ${{ inputs.SPK_ARCH }}
+          P4D_VERSION: ${{ inputs.P4D_VERSION }}
+          SPK_BETA: ${{ github.event_name != 'release' || (github.event_name == 'release' && github.event.release.prerelease) }}
+          SPK_PACKAGE_BUILD_NUMBER: "${{ github.run_number }}"
+
+      - name: Rename artifact
+        run: |
+          cp \
+            /toolkit/result_spk/HelixCoreServer-${{ steps.build_package.outputs.package_version }}/HelixCoreServer-${{ inputs.SPK_ARCH }}-${{ steps.build_package.outputs.package_version }}.spk \
+            ${{ runner.temp }}/HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ inputs.SPK_ARCH }}-${{ inputs.DSM_VERSION }}.spk
+
+      - id: upload_package
+        name: Upload Package
+        uses: actions/upload-artifact@v3
+        with:
+          name: HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ inputs.SPK_ARCH }}-${{ inputs.DSM_VERSION }}
+          path: ${{ runner.temp }}/HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ inputs.SPK_ARCH }}-${{ inputs.DSM_VERSION }}.spk
+          if-no-files-found: error
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 76d75a0..7e6a6af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,7 @@ on:
 
 jobs:
   build:
-    name: Build Packages
-    runs-on: ubuntu-latest
+    name: Build Package
     strategy:
       fail-fast: false
       matrix:
@@ -20,42 +19,12 @@ jobs:
         include:
           - SPK_PLATFORM: braswell
             SPK_ARCH: x86_64
-    steps:
-      - uses: actions/checkout@v3
-
-      - id: setup_toolchain
-        name: Setup Toolchain
-        run: |
-          sudo -E ./.ci/setup-toolchain.sh
-        env:
-          DSM_VERSION: ${{ matrix.DSM_VERSION }}
-          SPK_PLATFORM: ${{ matrix.SPK_PLATFORM }}
-
-      - id: build_package
-        name: Build Package
-        run: |
-          sudo -E ./.ci/build-package.sh
-        env:
-          DSM_VERSION: ${{ matrix.DSM_VERSION }}
-          SPK_PLATFORM: ${{ matrix.SPK_PLATFORM }}
-          SPK_ARCH: ${{ matrix.SPK_ARCH }}
-          P4D_VERSION: ${{ matrix.P4D_VERSION }}
-          SPK_BETA: ${{ github.event_name != 'release' || (github.event_name == 'release' && github.event.release.prerelease) }}
-          SPK_PACKAGE_BUILD_NUMBER: "${{ github.run_number }}"
-
-      - name: Rename artifact
-        run: |
-          cp \
-            /toolkit/result_spk/HelixCoreServer-${{ steps.build_package.outputs.package_version }}/HelixCoreServer-${{ matrix.SPK_ARCH }}-${{ steps.build_package.outputs.package_version }}.spk \
-            ${{ runner.temp }}/HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ matrix.SPK_ARCH }}-${{ matrix.DSM_VERSION }}.spk
-
-      - id: upload_package
-        name: Upload Package
-        uses: actions/upload-artifact@v3
-        with:
-          name: HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ matrix.SPK_ARCH }}-${{ matrix.DSM_VERSION }}
-          path: ${{ runner.temp }}/HelixCoreServer-${{ steps.build_package.outputs.package_version }}-${{ matrix.SPK_ARCH }}-${{ matrix.DSM_VERSION }}.spk
-          if-no-files-found: error
+    uses: ./.github/workflows/build-package.yml
+    with:
+      P4D_VERSION: ${{ matrix.P4D_VERSION }}
+      DSM_VERSION: ${{ matrix.DSM_VERSION }}
+      SPK_PLATFORM: ${{ matrix.SPK_PLATFORM }}
+      SPK_ARCH: ${{ matrix.SPK_ARCH }}
 
   release:
     name: Upload Packages in Github Release