From fd8111733d99dcff8717fe5fd69f7c855453082f Mon Sep 17 00:00:00 2001 From: sockheadrps Date: Tue, 15 Oct 2024 06:55:50 -0400 Subject: [PATCH 1/5] Fix build files --- .github/workflows/release.yml | 13 +++++++++++-- .github/workflows/rust.yml | 2 -- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb9a329..ccf0ee6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,9 @@ jobs: uses: actions/upload-artifact@v4 with: name: keystroke-display-ubuntu - path: target/release/ + path: | + target/release/keystroke-overlay-standalone + target/release/libkeystroke_overlay.so win-build: runs-on: windows-latest @@ -48,7 +50,9 @@ jobs: uses: actions/upload-artifact@v4 with: name: keystroke-display-windows - path: target/release/ + path: | + target/release/keystroke-overlay-standalone.exe + target/release/keystroke-overlay-standalone.dll release: runs-on: ubuntu-latest @@ -61,6 +65,11 @@ jobs: uses: actions/download-artifact@v4 with: path: target/release/ + + - name: Copy overlay folder + run: | + cp -r overlay/ target/release/keystroke-display-ubuntu + cp -r overlay/ target/release/keystroke-display-windows - name: Create ZIP files for Ubuntu run: | diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1c8c0c0..3a78f2e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,7 +1,5 @@ name: Rust - - on: push: branches: ['main'] From 0244cca0877c9d45de768f96d375520b5f81c56f Mon Sep 17 00:00:00 2001 From: sockheadrps Date: Tue, 15 Oct 2024 07:24:52 -0400 Subject: [PATCH 2/5] seperate standalone and plugin builds --- .github/workflows/release.yml | 50 ++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ccf0ee6..129b55e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,38 +20,44 @@ jobs: run: | cargo build --release - - name: Upload-artifacts + - name: Upload-artifacts-standalone uses: actions/upload-artifact@v4 with: - name: keystroke-display-ubuntu + name: keystroke-display-standalone-ubuntu path: | target/release/keystroke-overlay-standalone + + - name: Upload-artifacts-plugin + uses: actions/upload-artifact@v4 + with: + name: keystroke-display-plugin-ubuntu + path: | target/release/libkeystroke_overlay.so win-build: runs-on: windows-latest steps: - uses: actions/checkout@v3 - - uses: actions/cache@v4 - id: cache - with: - path: C:/Program Files/obs-studio/bin/64bit/obs64.exe - key: ${{ runner.os }}-obs-studio - name: Install OBS Studio - if: steps.cache.outputs.cache-hit != 'true' run: choco install obs-studio - name: Build run: | cargo build --release - - name: Upload-artifacts + - name: Upload-artifacts-standalone uses: actions/upload-artifact@v4 with: - name: keystroke-display-windows + name: keystroke-display-standalone-windows path: | target/release/keystroke-overlay-standalone.exe + + - name: Upload-artifacts-plugin + uses: actions/upload-artifact@v4 + with: + name: keystroke-display-plugin-windows + path: | target/release/keystroke-overlay-standalone.dll release: @@ -68,18 +74,30 @@ jobs: - name: Copy overlay folder run: | - cp -r overlay/ target/release/keystroke-display-ubuntu - cp -r overlay/ target/release/keystroke-display-windows + cp -r overlay/ target/release/keystroke-display-standalone-ubuntu + cp -r overlay/ target/release/keystroke-display-plugin-ubuntu + cp -r overlay/ target/release/keystroke-display-standalone-windows + cp -r overlay/ target/release/keystroke-display-plugin-windows - - name: Create ZIP files for Ubuntu + - name: Create ZIP files for Ubuntu Standalone run: | - cd target/release/keystroke-display-ubuntu + cd target/release/keystroke-display-standalone-ubuntu zip -r keystroke-display-ubuntu.zip * + + - name: Create ZIP files for Ubuntu Plugin + run: | + cd target/release/keystroke-display-plugin-ubuntu + zip -r keystroke-display-plugin-ubuntu.zip * - - name: Create ZIP files for Windows + - name: Create ZIP files for Windows Standalone run: | - cd target/release/keystroke-display-windows + cd target/release/keystroke-display-standalone-windows zip -r keystroke-display-windows.zip * + + - name: Create ZIP files for Windows Plugin + run: | + cd target/release/keystroke-display-plugin-windows + zip -r keystroke-display-plugin-windows.zip * - name: Release uses: softprops/action-gh-release@v2 From cd2b8f93043dafb52c0e8a580611a55c7b1584dd Mon Sep 17 00:00:00 2001 From: sockheadrps Date: Tue, 15 Oct 2024 07:31:37 -0400 Subject: [PATCH 3/5] include new zip files for plugin and standalone --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 129b55e..ea33b09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: - name: Create ZIP files for Ubuntu Standalone run: | cd target/release/keystroke-display-standalone-ubuntu - zip -r keystroke-display-ubuntu.zip * + zip -r keystroke-display-standalone-ubuntu.zip * - name: Create ZIP files for Ubuntu Plugin run: | @@ -92,7 +92,7 @@ jobs: - name: Create ZIP files for Windows Standalone run: | cd target/release/keystroke-display-standalone-windows - zip -r keystroke-display-windows.zip * + zip -r keystroke-display-standalone-windows.zip * - name: Create ZIP files for Windows Plugin run: | @@ -105,5 +105,7 @@ jobs: with: token: ${{ secrets.GH_TOKEN }} files: | - target/release/keystroke-display-ubuntu/keystroke-display-ubuntu.zip - target/release/keystroke-display-windows/keystroke-display-windows.zip + target/release/keystroke-display-ubuntu/keystroke-display-standalone-ubuntu.zip + target/release/keystroke-display-ubuntu/keystroke-display-plugin-ubuntu.zip + target/release/keystroke-display-windows/keystroke-display-standalone-windows.zip + target/release/keystroke-display-windows/keystroke-display-plugin-windows.zip From c38f8133e1e38e962f387e8e55b554a4f9d99058 Mon Sep 17 00:00:00 2001 From: sockheadrps Date: Tue, 15 Oct 2024 07:50:33 -0400 Subject: [PATCH 4/5] fix release output folder name --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea33b09..5fe2191 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,7 +105,7 @@ jobs: with: token: ${{ secrets.GH_TOKEN }} files: | - target/release/keystroke-display-ubuntu/keystroke-display-standalone-ubuntu.zip - target/release/keystroke-display-ubuntu/keystroke-display-plugin-ubuntu.zip - target/release/keystroke-display-windows/keystroke-display-standalone-windows.zip - target/release/keystroke-display-windows/keystroke-display-plugin-windows.zip + target/release/keystroke-display-standalone-ubuntu/keystroke-display-standalone-ubuntu.zip + target/release/keystroke-display-plugin-ubuntu/keystroke-display-plugin-ubuntu.zip + target/release/keystroke-display-standalone-windows/keystroke-display-standalone-windows.zip + target/release/keystroke-display-plugin-windows/keystroke-display-plugin-windows.zip From a6b2f3fa0c2dfe427cf148adc93487e2dea09ad5 Mon Sep 17 00:00:00 2001 From: sockheadrps Date: Tue, 15 Oct 2024 08:03:14 -0400 Subject: [PATCH 5/5] fix win-release plugin artifact upload --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fe2191..2520224 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: with: name: keystroke-display-plugin-windows path: | - target/release/keystroke-overlay-standalone.dll + target/release/keystroke_overlay.dll release: runs-on: ubuntu-latest