diff --git a/.github/workflows/publish-on-maven.yml b/.github/workflows/publish-on-maven.yml index 8352b6a3..d9e657c8 100644 --- a/.github/workflows/publish-on-maven.yml +++ b/.github/workflows/publish-on-maven.yml @@ -5,14 +5,58 @@ on: tags: - '**' +env: + NATIVE_LIBS_DIR: ${{ github.workspace }}/build/nativeLibs + jobs: + build-native: + runs-on: ${{ matrix.os }} + strategy: + matrix: + include: + - os: ubuntu-latest + command: bash linuxlib/build.sh + - os: macos-latest + command: bash maclib/build.sh + - os: windows-latest + command: cmd /c winlib/build.bat + + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Build native binary + run: ${{ matrix.command }} + env: + NATIVE_LIBS_OUTPUT_DIR: ${{ env.NATIVE_LIBS_DIR }} + + - name: Upload native binaries + uses: actions/upload-artifact@v4 + with: + name: nativeLibs-${{ matrix.os }} + path: ${{ env.NATIVE_LIBS_DIR }}/** + publish: + needs: [ "build-native" ] runs-on: macos-latest steps: - name: Checkout code uses: actions/checkout@v3 + - name: Download all native binaries + uses: actions/download-artifact@v4 + with: + name: nativeLibs-* + path: ${{ env.NATIVE_LIBS_DIR }} + merge-multiple: true + + - name: Copy native libs into src/commonMain/resources/ + run: | + mkdir -p src/commonMain/resources/ + cp -r ${{ env.NATIVE_LIBS_DIR }}/* src/commonMain/resources/ + - name: Set up JDK uses: actions/setup-java@v3 with: @@ -27,4 +71,3 @@ jobs: ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNINGINMEMORYKEY }} ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNINGKEYID }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNINGPASSWORD }} - diff --git a/.gitignore b/.gitignore index ca7a13ec..e40ad6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,9 @@ bin/ tray_position.properties linuxlib/build-x86-64 -linuxlibdbus/build-x86-64 \ No newline at end of file +linuxlibdbus/build-x86-64 + +# don't commit compiled native binaries +src/commonMain/resources/**/*.so +src/commonMain/resources/**/*.dll +src/commonMain/resources/**/*.dylib diff --git a/src/commonMain/resources/darwin-aarch64/libMacTray.dylib b/src/commonMain/resources/darwin-aarch64/libMacTray.dylib deleted file mode 100755 index 756be7f0..00000000 Binary files a/src/commonMain/resources/darwin-aarch64/libMacTray.dylib and /dev/null differ diff --git a/src/commonMain/resources/darwin-x86-64/libMacTray.dylib b/src/commonMain/resources/darwin-x86-64/libMacTray.dylib deleted file mode 100755 index 7c3cdd43..00000000 Binary files a/src/commonMain/resources/darwin-x86-64/libMacTray.dylib and /dev/null differ diff --git a/src/commonMain/resources/linux-x86-64/libsystray.so b/src/commonMain/resources/linux-x86-64/libsystray.so deleted file mode 100644 index 6479fb98..00000000 Binary files a/src/commonMain/resources/linux-x86-64/libsystray.so and /dev/null differ diff --git a/src/commonMain/resources/win32-arm64/tray.dll b/src/commonMain/resources/win32-arm64/tray.dll deleted file mode 100644 index ae413381..00000000 Binary files a/src/commonMain/resources/win32-arm64/tray.dll and /dev/null differ diff --git a/src/commonMain/resources/win32-x86-64/tray.dll b/src/commonMain/resources/win32-x86-64/tray.dll deleted file mode 100644 index 00cc5cb1..00000000 Binary files a/src/commonMain/resources/win32-x86-64/tray.dll and /dev/null differ