From deb46385d5932b2054a5c0d2a1bee771c6149c76 Mon Sep 17 00:00:00 2001 From: Norbert Takacs Date: Wed, 14 Dec 2022 14:51:59 +0100 Subject: [PATCH 1/2] github-actions: rename built-plugin to built-plugin-windows --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/release.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3218764..9f57afb 100644 --- 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08ca9fe..8d04808 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,21 +29,21 @@ jobs: 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: Copy 3rd party dlls (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/ + 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 + - name: Create release plugin zip (Windows) run: | - cd built-plugin + cd built-plugin-windows zip -r ../${RELEASE_PLUGIN_ZIP} . - name: Create sample configs zip From abd41a401bb10fb2057ef4d6163de52b1a9bcac3 Mon Sep 17 00:00:00 2001 From: Norbert Takacs Date: Wed, 14 Dec 2022 14:58:27 +0100 Subject: [PATCH 2/2] github-actions: create linux release --- .github/workflows/build-and-test.yml | 7 +++++++ .github/workflows/release.yml | 19 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9f57afb..8c4d859 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -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 index 8d04808..385407f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,8 @@ 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: @@ -35,6 +36,12 @@ jobs: name: built-plugin-windows path: built-plugin-windows/plugins/XPanel/64/ + - 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/ @@ -44,7 +51,12 @@ jobs: - name: Create release plugin zip (Windows) run: | cd built-plugin-windows - zip -r ../${RELEASE_PLUGIN_ZIP} . + zip -r ../${WINDOWS_RELEASE_PLUGIN_ZIP} . + + - name: Create release plugin zip (Linux) + run: | + 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}