Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

client

Clone or download

Added x86 Windows

Download Browse
+94 −30
Debayan Sutradhar (rnayabed) 2021-06-25 20:54
Debayan Sutradhar (rnayabed) 2021-06-25 20:54
4365cf564abd69789cc35324efade0deb2297406
d2d52fc4f0f36946b76e08026121108fb4f0ba29
git #client/4365cf564abd69789cc35324efade0deb2297406

Modified Files

List
Side by side diff
M .github/scripts/jpackage.bat
+1 −1
--- 'a/.github/scripts/jpackage.bat'
+++ b/.github/scripts/jpackage.bat
@@ -25,5 +25,5 @@ echo Done now renaming ..
cd %INSTALL_DIR%
echo run dir
dir
-ren *.msi stream-pi-client-windows-x64-%VERSION%-installer.msi
+ren *.msi stream-pi-client-windows-%ARCH%-%VERSION%-installer.msi
dir
\ No newline at end of file
M .github/workflows/build.yml
+70 −14
--- 'a/.github/workflows/build.yml'
+++ b/.github/workflows/build.yml
@@ -7,16 +7,18 @@ on:
- completed
jobs:
- build-linux-and-android:
+ build-linux-x64-and-android-aarch64:
runs-on: ubuntu-20.04
steps:
- name: Install packages
run: sudo apt install axel libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libgl-dev libgtk-3-dev libpango1.0-dev libxtst-dev xdg-utils libc6 xdg-utils zlib1g libpng16-16 libasound2 libbsd-dev zip libblkid1 libdbus-1-3 libexpat1 libgpg-error0 liblzma5 libmount1 libpcre3 libselinux1 libsystemd0 libuuid1
- uses: actions/checkout@v2
- name: Setup java
- uses: joschi/setup-jdk@v2
+ uses: actions/setup-java@v2
with:
java-version: 16
+ distribution: adopt
+ architecture: x64
- name: Setup JavaFX
run: |
cd /tmp
@@ -103,32 +105,34 @@ jobs:
- name: Saving Linux x64 DEB
uses: actions/upload-artifact@v2
with:
- name: linux-deb
+ name: linux-deb-x64
path: target/install/stream-pi-client-linux-x64-${{ env.VERSION }}.deb
- name: Saving Linux x64 RPM
uses: actions/upload-artifact@v2
with:
- name: linux-rpm
+ name: linux-rpm-x64
path: target/install/stream-pi-client-linux-x64-${{ env.VERSION }}.rpm
- name: Saving Linux x64 ZIP
uses: actions/upload-artifact@v2
with:
- name: linux-zip
+ name: linux-zip-x64
path: target/install/stream-pi-client-linux-x64-${{ env.VERSION }}-executable.zip
- name: Saving Android aarch64 APK
uses: actions/upload-artifact@v2
with:
- name: android-apk
+ name: android-apk-aarch64
path: target/install/*.apk
- build-macos:
+ build-macos-x64:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- name: Setup java
- uses: joschi/setup-jdk@v2
+ uses: actions/setup-java@v2
with:
java-version: 16
+ distribution: adopt
+ architecture: x64
- name: Setup JavaFX
run: |
wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_osx-x64_bin-jmods.zip
@@ -174,17 +178,19 @@ jobs:
- name: Saving MacOS x64 PKG
uses: actions/upload-artifact@v2
with:
- name: macos-pkg
+ name: macos-pkg-x64
path: target/install/stream-pi-client-macos-x64-${{ env.VERSION }}.pkg
- build-windows:
+ build-windows-x64:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- name: Setup java
- uses: joschi/setup-jdk@v2
+ uses: actions/setup-java@v2
with:
java-version: 16
+ distribution: adopt
+ architecture: x64
- name: Download REQ_MODULES
uses: dawidd6/action-download-artifact@v2
with:
@@ -215,13 +221,61 @@ jobs:
JAVAFX_JMODS: D:\javafx-jmods-17\
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
INSTALL_DIR: target/install
+ ARCH: x64
- name: Saving Windows x64 EXE
uses: actions/upload-artifact@v2
with:
- name: windows-msi
+ name: windows-msi-x64
path: target/install/*.msi
- build-arm32:
+ build-windows-x86:
+ runs-on: windows-2019
+ steps:
+ - uses: actions/checkout@v2
+ - name: Setup java
+ uses: actions/setup-java@v2
+ with:
+ java-version: 16
+ distribution: adopt
+ architecture: x86
+ - name: Download REQ_MODULES
+ uses: dawidd6/action-download-artifact@v2
+ with:
+ workflow: init.yml
+ name: req_modules
+ - name: Download VERSION
+ uses: dawidd6/action-download-artifact@v2
+ with:
+ workflow: init.yml
+ name: version
+ - name: Setup JavaFX
+ run: |
+ bitsadmin /Transfer DownloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_windows-x86_bin-jmods.zip D:\openjfx-17-ea+12_windows-x86_bin-jmods.zip
+ Expand-Archive -Force D:\openjfx-17-ea+12_windows-x86_bin-jmods.zip D:\
+ - name: Download built jars
+ uses: dawidd6/action-download-artifact@v2
+ with:
+ workflow: init.yml
+ name: built-jars
+ path: target/lib/
+ - name: Create Bundle using JPackage
+ id: project
+ shell: cmd
+ run: |
+ call .github\scripts\jpackage.bat
+ env:
+ MAIN_CLASS: com.stream_pi.client.Main
+ JAVAFX_JMODS: D:\javafx-jmods-17\
+ JPACKAGE_HOME: ${{ env.JAVA_HOME }}
+ INSTALL_DIR: target/install
+ ARCH: x86
+ - name: Saving Windows x86 EXE
+ uses: actions/upload-artifact@v2
+ with:
+ name: windows-msi-x86
+ path: target/install/*.msi
+
+ build-linux-arm32:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2.1.0
@@ -277,5 +331,7 @@ jobs:
- name: Saving Linux ARM32 ZIP
uses: actions/upload-artifact@v2
with:
- name: linux-arm32-zip
+ name: linux-zip-arm32
path: target/install/stream-pi-client-linux-arm32-${{ env.VERSION }}-executable.zip
+
+
M .github/workflows/init.yml
+3 −1
--- 'a/.github/workflows/init.yml'
+++ b/.github/workflows/init.yml
@@ -11,9 +11,11 @@ jobs:
run: sudo apt install unzip axel
- uses: actions/checkout@v2
- name: Setup java
- uses: joschi/setup-jdk@v2
+ uses: actions/setup-java@v2
with:
java-version: 16
+ distribution: adopt
+ architecture: x64
- name: Setup JavaFX
run: |
cd /tmp
M .github/workflows/release.yml
+20 −14
--- 'a/.github/workflows/release.yml'
+++ b/.github/workflows/release.yml
@@ -18,47 +18,53 @@ jobs:
- name: Add Version to environment
run: |
echo "VERSION=$(<version.txt)" >> $GITHUB_ENV
- - name: Download windows msi
+ - name: Download windows x64 msi
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: windows-msi
+ name: windows-msi-x64
path: target/install
- - name: Download linux deb
+ - name: Download windows x86 msi
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: linux-deb
+ name: windows-msi-x86
path: target/install
- - name: Download linux rpm
+ - name: Download linux x64 deb
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: linux-rpm
+ name: linux-deb-x64
path: target/install
- - name: Download linux zip
+ - name: Download linux x64 rpm
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: linux-zip
+ name: linux-rpm-x64
path: target/install
- - name: Download MacOS PKG
+ - name: Download linux x64 zip
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: macos-pkg
+ name: linux-zip-x64
path: target/install
- - name: Download Android APK
+ - name: Download MacOS x64 PKG
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: android-apk
+ name: macos-pkg-x64
path: target/install
- - name: Download Android APK
+ - name: Download Android aarch64 APK
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
- name: linux-arm32-zip
+ name: android-apk-aarch64
+ path: target/install
+ - name: Download Linux arm32 APK
+ uses: dawidd6/action-download-artifact@v2
+ with:
+ workflow: build.yml
+ name: linux-zip-arm32
path: target/install
- name: Delete old release if exists
uses: dev-drprasad/delete-tag-and-release@v0.2.0