Merge pull request #50 from norberttak:linux-release

Linux release
norberttak · Dec 14, 2022 · 2665cd8 · 2665cd8
2 parents 7e64ab8 + abd41a4
commit 2665cd8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Upload built plugin
         uses: actions/upload-artifact@v3
         with:
-          name: built-plugin
+          name: built-plugin-windows
           path: Release/plugins/XPanel/64/*
 
       - name: Upload test logs
@@ -72,3 +72,10 @@ jobs:
 
       - name: Install
         run: cmake --build build --target install
+
+      - name: Upload built plugin (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v3
+        with:
+          name: built-plugin-linux
+          path: ${{ github.workspace }}/install/XPanel/64/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,28 +23,40 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       TAG: v${{ inputs.release-version }}
-      RELEASE_PLUGIN_ZIP: xpanel_v${{ inputs.release-version }}.zip
+      WINDOWS_RELEASE_PLUGIN_ZIP: xpanel_windows_v${{ inputs.release-version }}.zip
+      LINUX_RELEASE_PLUGIN_ZIP: xpanel_linux_v${{ inputs.release-version }}.zip
       SAMPLE_CONFIG_ZIP: sample_configs_v${{ inputs.release-version }}.zip
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Download built plugin
+      - name: Download built plugin (Windows)
         uses: actions/download-artifact@v3
         with:
-          name: built-plugin
-          path: built-plugin/plugins/XPanel/64/
+          name: built-plugin-windows
+          path: built-plugin-windows/plugins/XPanel/64/
 
-      - name: Copy 3rd party dlls
+      - name: Download built plugin (Linux)
+        uses: actions/download-artifact@v3
+        with:
+          name: built-plugin-linux
+          path: built-plugin-linux/plugins/XPanel/64/
+
+      - name: Copy 3rd party dlls (Windows)
+        run: |
+          cp LUA/lua54.dll built-plugin-windows/plugins/XPanel/64/
+          cp hidapi/lib/hidapi.dll built-plugin-windows/plugins/XPanel/64/
+          cp FIP-SDK/lib/DirectOutput.dll built-plugin-windows/plugins/XPanel/64/
+
+      - name: Create release plugin zip (Windows)
         run: |
-          cp LUA/lua54.dll built-plugin/plugins/XPanel/64/
-          cp hidapi/lib/hidapi.dll built-plugin/plugins/XPanel/64/
-          cp FIP-SDK/lib/DirectOutput.dll built-plugin/plugins/XPanel/64/
+          cd built-plugin-windows
+          zip -r ../${WINDOWS_RELEASE_PLUGIN_ZIP} .
 
-      - name: Create release plugin zip
+      - name: Create release plugin zip (Linux)
         run: |
-          cd built-plugin
-          zip -r ../${RELEASE_PLUGIN_ZIP} .
+          cd built-plugin-linux
+          zip -r ../${LINUX_RELEASE_PLUGIN_ZIP} .
 
       - name: Create sample configs zip
         run: |
@@ -58,5 +70,6 @@ jobs:
             --title "v${{ inputs.release-version }} release" \
             --generate-notes \
             ${TAG} \
-            ${RELEASE_PLUGIN_ZIP} \
+            ${WINDOWS_RELEASE_PLUGIN_ZIP} \
+            ${LINUX_RELEASE_PLUGIN_ZIP} \
             ${SAMPLE_CONFIG_ZIP}