From 93f8d44e41fc1e5385b588a7085bd626a5e35a27 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 14:09:48 +0100 Subject: [PATCH 01/57] Create release workflow, add steps for linux --- .github/workflows/release.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..a595595cc --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,18 @@ +name: Release +on: workflow_dispatch +jobs: + linux: + runs-on: ubuntu-latest + steps: + - name: Get Code + uses: actions/checkout@v3 + - name: Install JDK + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "zulu" + java-package: jdk + architecture: x64 + check-latest: true + - name: Test JDK Install + run: java -version From d43f596e349283e03e7e932c9cfd28a916026b73 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 14:13:15 +0100 Subject: [PATCH 02/57] Update release workflow: install ant --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a595595cc..55eb6b308 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,5 +14,7 @@ jobs: java-package: jdk architecture: x64 check-latest: true - - name: Test JDK Install - run: java -version + - name: Install ant + run: sudo apt install ant -y + - name: Test ant Install + run: ant -version From 90be7ca9e750ba318174cd0d5d44712b7ecc510b Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 14:31:49 +0100 Subject: [PATCH 03/57] Update release workflow: build AsTeRICS with ant --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55eb6b308..7fecec5ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,5 +16,5 @@ jobs: check-latest: true - name: Install ant run: sudo apt install ant -y - - name: Test ant Install - run: ant -version + - name: Build AsTeRICS + run: VERSION=v4.5; ant deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION From fb9c50a3720feb005eee8c8ff9f3f24c00b0cec2 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 14:39:15 +0100 Subject: [PATCH 04/57] Update release workflow: specify build file --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fecec5ea..2e9b1ddab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,7 @@ name: Release on: workflow_dispatch +env: + VERSION: v4.5 jobs: linux: runs-on: ubuntu-latest @@ -17,4 +19,4 @@ jobs: - name: Install ant run: sudo apt install ant -y - name: Build AsTeRICS - run: VERSION=v4.5; ant deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION From 1e5cc756e4456f2744c24575b8f311df9c29fe54 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 15:42:39 +0100 Subject: [PATCH 05/57] Update release workflow: use oracle instead of zulu --- .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 2e9b1ddab..aaeeb5150 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: "8" - distribution: "zulu" + distribution: "oracle" java-package: jdk architecture: x64 check-latest: true From 9fe09534eed0bc59fd57f236c7bc057f0e557760 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 15:45:53 +0100 Subject: [PATCH 06/57] Update release workflow: switch back to zulu with different java package --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aaeeb5150..19f970ec4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,9 @@ jobs: uses: actions/setup-java@v3 with: java-version: "8" - distribution: "oracle" - java-package: jdk - architecture: x64 + distribution: "zulu" + java-package: "jdk+fx" + architecture: "x64" check-latest: true - name: Install ant run: sudo apt install ant -y From 1a2eda51edae89303f9cb492cd657805537011cf Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 15:51:49 +0100 Subject: [PATCH 07/57] Update release workflow: turn on verbose mode --- .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 19f970ec4..5e1e6c9a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,4 +19,4 @@ jobs: - name: Install ant run: sudo apt install ant -y - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true From 025e408cb51a9c86885936789b05851b887e0fab Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 15:57:28 +0100 Subject: [PATCH 08/57] Update release workflow: change version to start with number --- .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 5e1e6c9a3..8852ae343 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ name: Release on: workflow_dispatch env: - VERSION: v4.5 + VERSION: 4.5 jobs: linux: runs-on: ubuntu-latest From fd0b5d435524c31a51e04d5f030d24ffca99f2e9 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 16:06:32 +0100 Subject: [PATCH 09/57] Update release workflow: upload build artifact, test installation --- .github/workflows/release.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8852ae343..34aa80b16 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,3 +20,18 @@ jobs: run: sudo apt install ant -y - name: Build AsTeRICS run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + - name: Release .deb File + uses: actions/upload-artifact@v3 + with: + name: AsTeRICS ${{ env.VERSION }} (linux) + path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.deb + linux-install: + needs: linux + runs-on: ubuntu-latest + steps: + - name: Get Software + uses: actions/download-artifact@v3 + with: + name: AsTeRICS ${{ env.VERSION }} (linux) + - name: Install Package + run: sudo apt install ./asterics-are-${{ env.VERSION }}.deb From c782204d8545352f5d868bf9a16eace9fca55396 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 22:23:03 +0100 Subject: [PATCH 10/57] Update release workflow: add desktop directory for install step, enable debugging output of apt --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34aa80b16..2f8208ff2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,5 +33,7 @@ jobs: uses: actions/download-artifact@v3 with: name: AsTeRICS ${{ env.VERSION }} (linux) + - name: Setup Machine + run: sudo mkdir /usr/share/desktop-directories - name: Install Package - run: sudo apt install ./asterics-are-${{ env.VERSION }}.deb + run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb From 4c080023ca5dfa98447e9168c9fc501fefac0523 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 23:00:25 +0100 Subject: [PATCH 11/57] Update release workflow: log version after install --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f8208ff2..609aa3d86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,3 +37,5 @@ jobs: run: sudo mkdir /usr/share/desktop-directories - name: Install Package run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb + - name: Log Version + run: asterics-are -version From 6ba4005247b3f97a1f442d78c4d59a8a7610603b Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 23:15:03 +0100 Subject: [PATCH 12/57] Update release workflow: setup windows runner --- .github/workflows/release-windows.yml | 20 ++++++++++++++++++++ .github/workflows/release.yml | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release-windows.yml diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml new file mode 100644 index 000000000..ec104d492 --- /dev/null +++ b/.github/workflows/release-windows.yml @@ -0,0 +1,20 @@ +name: Release (Windows) +on: workflow_dispatch +env: + VERSION: 4.5 +jobs: + windows: + runs-on: windows-latest + steps: + - name: Get Code + uses: actions/checkout@v3 + - name: Install JDK + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "zulu" + java-package: "jdk+fx" + architecture: "x64" + check-latest: true + - name: Log JDK version + run: java -version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 609aa3d86..e9c6dd3ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,5 +37,5 @@ jobs: run: sudo mkdir /usr/share/desktop-directories - name: Install Package run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb - - name: Log Version - run: asterics-are -version + # - name: Log Version + # run: asterics-are -version From 952bdc6527d015593c423bb6ef0f109c9cd257c3 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Mon, 28 Nov 2022 23:45:24 +0100 Subject: [PATCH 13/57] Update release workflow: download InnoSetup Tool --- .github/workflows/release-windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index ec104d492..2383ba5ac 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -16,5 +16,7 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - - name: Log JDK version - run: java -version + - name: Download InnoSetup Tool issc.exe + run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 + - name: Show files + run: dir From 912f33b29675ac58c557cd26c768eb901c499580 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 00:06:27 +0100 Subject: [PATCH 14/57] Update release workflow: install InnoSetup Tool --- .github/workflows/release-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 2383ba5ac..7a77b0016 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -18,5 +18,7 @@ jobs: check-latest: true - name: Download InnoSetup Tool issc.exe run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 + - name: install InnoSetup Tool + run: start is.exe - name: Show files run: dir From abac1c3374b4579656bcfe88236397dd93617f54 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 00:14:51 +0100 Subject: [PATCH 15/57] Update release workflow: log Windows version --- .github/workflows/release-windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 7a77b0016..aa3a19e93 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -6,6 +6,8 @@ jobs: windows: runs-on: windows-latest steps: + - name: Show Windows Version + run: systeminfo - name: Get Code uses: actions/checkout@v3 - name: Install JDK @@ -18,7 +20,7 @@ jobs: check-latest: true - name: Download InnoSetup Tool issc.exe run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 - - name: install InnoSetup Tool - run: start is.exe - - name: Show files - run: dir + # - name: install InnoSetup Tool + # run: start is.exe + # - name: Show files + # run: dir From e7a75a60dccc73160e0f38ecdb5e19fdc2c68bb3 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 09:50:20 +0100 Subject: [PATCH 16/57] Update release workflow: run exe from absolute path --- .github/workflows/release-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index aa3a19e93..ccbdce80f 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -24,3 +24,5 @@ jobs: # run: start is.exe # - name: Show files # run: dir + - name: install InnoSetup Tool + run: D:\a\AsTeRICS\AsTeRICS\is.exe From 67e667ad6a9c56e3e256244bdae02605c9115616 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 09:52:56 +0100 Subject: [PATCH 17/57] Update release workflow: remove verbose output for install process (linux, apt) --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9c6dd3ff..b1eb20b13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: - name: Setup Machine run: sudo mkdir /usr/share/desktop-directories - name: Install Package - run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb + run: sudo apt install ./asterics-are-${{ env.VERSION }}.deb + # run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb # - name: Log Version # run: asterics-are -version From e49147d1784fecc3967daba553ea09af76d640d7 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 10:11:07 +0100 Subject: [PATCH 18/57] Update release workflow: change window image --- .github/workflows/release-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index ccbdce80f..77846e886 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -4,7 +4,7 @@ env: VERSION: 4.5 jobs: windows: - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Show Windows Version run: systeminfo From 8f569e0754aac3c1c658f27d6cdcfdec2e9e82cf Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 21:46:33 +0100 Subject: [PATCH 19/57] Update release workflow: test InnoSetup Tool availablility --- .github/workflows/release-windows.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 77846e886..b4c1c203f 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -4,7 +4,7 @@ env: VERSION: 4.5 jobs: windows: - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Show Windows Version run: systeminfo @@ -24,5 +24,7 @@ jobs: # run: start is.exe # - name: Show files # run: dir - - name: install InnoSetup Tool - run: D:\a\AsTeRICS\AsTeRICS\is.exe + # - name: install InnoSetup Tool + # run: D:\a\AsTeRICS\AsTeRICS\is.exe + - name: Run InnoSetup Tool + run: issc.exe -h From b6963714503e53eb7f5c4faded5241ba659cbfbd Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 21:53:47 +0100 Subject: [PATCH 20/57] Update release workflow: test chocolatey installation --- .github/workflows/release-windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index b4c1c203f..35eec696d 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -18,13 +18,15 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - - name: Download InnoSetup Tool issc.exe - run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 + # - name: Download InnoSetup Tool issc.exe + # run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 # - name: install InnoSetup Tool # run: start is.exe # - name: Show files # run: dir # - name: install InnoSetup Tool # run: D:\a\AsTeRICS\AsTeRICS\is.exe - - name: Run InnoSetup Tool - run: issc.exe -h + # - name: Run InnoSetup Tool + # run: issc.exe -h + - name: Test chocolatey installation + run: cinst -h From b5cdf3cfa55f2448ad3801e9197f1ca9f5f7401c Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 22:00:23 +0100 Subject: [PATCH 21/57] Update release workflow: install InnoSetup with chocolatey --- .github/workflows/release-windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 35eec696d..57ba2ffb7 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -26,7 +26,9 @@ jobs: # run: dir # - name: install InnoSetup Tool # run: D:\a\AsTeRICS\AsTeRICS\is.exe - # - name: Run InnoSetup Tool - # run: issc.exe -h - - name: Test chocolatey installation - run: cinst -h + # - name: Test chocolatey installation + # run: cinst -h + - name: Install InnoSetup Tool + run: cinst InnoSetup -y + - name: Run InnoSetup Tool + run: issc -h From 1aba13ff58f89145e67da518eb789f1ed668544c Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 22:10:45 +0100 Subject: [PATCH 22/57] Update release workflow: run help command --- .github/workflows/release-windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 57ba2ffb7..5a91e8fb2 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -28,7 +28,9 @@ jobs: # run: D:\a\AsTeRICS\AsTeRICS\is.exe # - name: Test chocolatey installation # run: cinst -h - - name: Install InnoSetup Tool - run: cinst InnoSetup -y - - name: Run InnoSetup Tool - run: issc -h + # - name: Install InnoSetup Tool + # run: cinst InnoSetup -y + # - name: Run InnoSetup Tool + # run: issc -h + - name: Run help + run: help From c4e16a12ba79750f348c519654783547cf9e95c0 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 22:16:36 +0100 Subject: [PATCH 23/57] Update release workflow: correct typo of InnoSetup invocation --- .github/workflows/release-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 5a91e8fb2..2badfde84 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -30,7 +30,7 @@ jobs: # run: cinst -h # - name: Install InnoSetup Tool # run: cinst InnoSetup -y - # - name: Run InnoSetup Tool - # run: issc -h - - name: Run help - run: help + - name: Run InnoSetup Tool + run: iscc.exe -h + # - name: Run help + # run: help From eb21dc107c8a0bd5025058f5246dbd503cad6584 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 22:20:00 +0100 Subject: [PATCH 24/57] Update release workflow: add build setup for windows --- .github/workflows/release-windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 2badfde84..904a9d710 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -30,7 +30,9 @@ jobs: # run: cinst -h # - name: Install InnoSetup Tool # run: cinst InnoSetup -y - - name: Run InnoSetup Tool - run: iscc.exe -h + # - name: Run InnoSetup Tool + # run: iscc.exe -h # - name: Run help # run: help + - name: Build AsTeRICS + run: bash -ex ./Installer/jenkins-release-script.sh From 594af7e6874cdd511800538c009efa9d159fae5c Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 22:33:41 +0100 Subject: [PATCH 25/57] Remove call to center splash screen in setup.iss Property Center is not available (anymore?, cf. https://jrsoftware.org/ishelp/index.php?topic=isxfunc_createcustomform) --- Installer/setup.iss | 1 - 1 file changed, 1 deletion(-) diff --git a/Installer/setup.iss b/Installer/setup.iss index fce060290..70b21d7d3 100644 --- a/Installer/setup.iss +++ b/Installer/setup.iss @@ -94,7 +94,6 @@ begin Splash.Width := BitmapImage1.Width; Splash.Height := BitmapImage1.Height; - Splash.Center; Splash.Show; BitmapImage1.Refresh; From f1cc3c95d4832adc02eee7ff0bd99ba40a1495dc Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 23:20:02 +0100 Subject: [PATCH 26/57] Update release workflow: upload windows exe --- .github/workflows/release-windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 904a9d710..047965709 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -36,3 +36,8 @@ jobs: # run: help - name: Build AsTeRICS run: bash -ex ./Installer/jenkins-release-script.sh + - name: Release .exe File + uses: actions/upload-artifact@v3 + with: + name: AsTeRICS ${{ env.VERSION }} (windows) + path: Setup_AsTeRICS_${{ env.VERSION }}.exe From 08726dd2effb59ee939e3e4d297e77a85a328c0d Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 23:47:51 +0100 Subject: [PATCH 27/57] Update release workflow: rename linux build workflow --- .github/workflows/{release.yml => release-linux.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{release.yml => release-linux.yml} (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release-linux.yml similarity index 100% rename from .github/workflows/release.yml rename to .github/workflows/release-linux.yml From 89f74250cb1a05408cade253ddb841ad568a459e Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 23:48:18 +0100 Subject: [PATCH 28/57] Update release workflow: remove comments --- .github/workflows/release-linux.yml | 3 --- .github/workflows/release-windows.yml | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index b1eb20b13..c140e00e0 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -37,6 +37,3 @@ jobs: run: sudo mkdir /usr/share/desktop-directories - name: Install Package run: sudo apt install ./asterics-are-${{ env.VERSION }}.deb - # run: sudo apt -oDebug::pkgProblemResolver=1 -oDebug::pkgDPkgPM=1 -oDebug::Acquire::http=1 install ./asterics-are-${{ env.VERSION }}.deb - # - name: Log Version - # run: asterics-are -version diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 047965709..eb577ead3 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -18,22 +18,6 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - # - name: Download InnoSetup Tool issc.exe - # run: curl.exe -o is.exe https://jrsoftware.org/download.php/is.exe?site=2 - # - name: install InnoSetup Tool - # run: start is.exe - # - name: Show files - # run: dir - # - name: install InnoSetup Tool - # run: D:\a\AsTeRICS\AsTeRICS\is.exe - # - name: Test chocolatey installation - # run: cinst -h - # - name: Install InnoSetup Tool - # run: cinst InnoSetup -y - # - name: Run InnoSetup Tool - # run: iscc.exe -h - # - name: Run help - # run: help - name: Build AsTeRICS run: bash -ex ./Installer/jenkins-release-script.sh - name: Release .exe File From e657a9a965bf778a03266ec621e54082cab9f6fb Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 23:55:25 +0100 Subject: [PATCH 29/57] Update release workflow: add workflow for mac --- .github/workflows/release-mac.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/release-mac.yml diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml new file mode 100644 index 000000000..2ab99f04a --- /dev/null +++ b/.github/workflows/release-mac.yml @@ -0,0 +1,31 @@ +name: Release +on: workflow_dispatch +env: + VERSION: 4.5 +jobs: + linux: + runs-on: macos-latest + steps: + - name: Get Code + uses: actions/checkout@v3 + - name: Install JDK + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "zulu" + java-package: "jdk+fx" + architecture: "x64" + check-latest: true + - name: Test java installation + run: java -version + - name: List files + run: ls + # - name: Install ant + # run: sudo apt install ant -y + # - name: Build AsTeRICS + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + # - name: Release .deb File + # uses: actions/upload-artifact@v3 + # with: + # name: AsTeRICS ${{ env.VERSION }} (linux) + # path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.deb From f96d833f8c1399f9195277331627742169a71a76 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Tue, 29 Nov 2022 23:56:05 +0100 Subject: [PATCH 30/57] Update release workflow: rename workflows --- .github/workflows/release-linux.yml | 2 +- .github/workflows/release-mac.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index c140e00e0..a4ae21487 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -1,4 +1,4 @@ -name: Release +name: Release (Linux) on: workflow_dispatch env: VERSION: 4.5 diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 2ab99f04a..9efb977c8 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -1,4 +1,4 @@ -name: Release +name: Release (macOS) on: workflow_dispatch env: VERSION: 4.5 From eb68ec0f8c0aa3b8b0bab1b7c41e5dfffcffdd13 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 00:11:10 +0100 Subject: [PATCH 31/57] Update release workflow: install ant, build and upload AsTeRICS (macOS) --- .github/workflows/release-mac.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 9efb977c8..bab1ef742 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -3,7 +3,7 @@ on: workflow_dispatch env: VERSION: 4.5 jobs: - linux: + mac: runs-on: macos-latest steps: - name: Get Code @@ -16,16 +16,12 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - - name: Test java installation - run: java -version - - name: List files - run: ls - # - name: Install ant - # run: sudo apt install ant -y - # - name: Build AsTeRICS - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - # - name: Release .deb File - # uses: actions/upload-artifact@v3 - # with: - # name: AsTeRICS ${{ env.VERSION }} (linux) - # path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.deb + - name: Install ant + run: brew install ant + - name: Build AsTeRICS + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + - name: Release .deb File + uses: actions/upload-artifact@v3 + with: + name: AsTeRICS ${{ env.VERSION }} (mac) + path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg From e6dab529a758c198410db022cfc6363ace0de46f Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 00:21:33 +0100 Subject: [PATCH 32/57] Update release workflow: log environment variables --- .github/workflows/release-mac.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index bab1ef742..54da2c39d 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -18,9 +18,13 @@ jobs: check-latest: true - name: Install ant run: brew install ant + - name: Log environment variables & JAVA_HOME + run: | + echo $JAVA_HOME + printenv - name: Build AsTeRICS run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - - name: Release .deb File + - name: Release .dmg File uses: actions/upload-artifact@v3 with: name: AsTeRICS ${{ env.VERSION }} (mac) From 66be8b50e1e05a3ce6a79b8a83e7a7138abbad2c Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 17:42:05 +0100 Subject: [PATCH 33/57] Update release workflow: set java platform manually --- .github/workflows/release-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 54da2c39d..42618135b 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -23,7 +23,7 @@ jobs: echo $JAVA_HOME printenv - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME - name: Release .dmg File uses: actions/upload-artifact@v3 with: From bae49237e11956102994c5f7b03dc551b87917aa Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 17:54:13 +0100 Subject: [PATCH 34/57] Update release workflow: list content of JAVA_HOME --- .github/workflows/release-mac.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 42618135b..3f21c76e1 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -22,8 +22,15 @@ jobs: run: | echo $JAVA_HOME printenv + - name: Show content of JAVA_HOME + run: | + ls $JAVA_HOME + echo "==== JAVA_HOME/bin" + ls $JAVA_HOME/bin + echo "==== JAVA_HOME/jre" + ls $JAVA_HOME/jre - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/jre - name: Release .dmg File uses: actions/upload-artifact@v3 with: From ad1431a2148e98d5b21611492788df780b47e0c6 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 18:56:31 +0100 Subject: [PATCH 35/57] Update release workflow: create Contents/Home in JAVA_HOME --- .github/workflows/release-linux.yml | 4 ++-- .github/workflows/release-mac.yml | 28 +++++++++++++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index a4ae21487..a37394450 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -16,8 +16,8 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - - name: Install ant - run: sudo apt install ant -y + # - name: Install ant + # run: sudo apt install ant -y - name: Build AsTeRICS run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .deb File diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 3f21c76e1..c73a8b235 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -16,21 +16,31 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - - name: Install ant - run: brew install ant + # - name: Install ant + # run: brew install ant - name: Log environment variables & JAVA_HOME run: | echo $JAVA_HOME printenv + - name: Create Contents/Home + run: mkdir -p $JAVA_HOME/Contents/Home + - name: Create link to jre Contents/Home + run: ln -s ../../jre $JAVA_HOME/Contents/Home/jre - name: Show content of JAVA_HOME - run: | - ls $JAVA_HOME - echo "==== JAVA_HOME/bin" - ls $JAVA_HOME/bin - echo "==== JAVA_HOME/jre" - ls $JAVA_HOME/jre + run: ls $JAVA_HOME + - name: Show content of JAVA_HOME/Contents + run: ls $JAVA_HOME/Contents + - name: Show content of JAVA_HOME/Contents/Home + run: ls $JAVA_HOME/Contents/Home + - name: Show content of JAVA_HOME/Contents/Home/jre + run: ls $JAVA_HOME/Contents/Home/jre + - name: Show content of JAVA_HOME/bin + run: ls $JAVA_HOME/bin + - name: Show content of JAVA_HOME/jre + run: ls $JAVA_HOME/jre - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/jre + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .dmg File uses: actions/upload-artifact@v3 with: From c59153c584cfcd407181d7e229e36198495c6151 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 22:43:45 +0100 Subject: [PATCH 36/57] Update release workflow: use preinstalled java --- .github/workflows/release-mac.yml | 68 +++++++++++++++++-------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index c73a8b235..dc1e3c61a 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -8,41 +8,49 @@ jobs: steps: - name: Get Code uses: actions/checkout@v3 - - name: Install JDK - uses: actions/setup-java@v3 - with: - java-version: "8" - distribution: "zulu" - java-package: "jdk+fx" - architecture: "x64" - check-latest: true + - name: Log java version + run: java -version + # - name: Install JDK + # uses: actions/setup-java@v3 + # with: + # java-version: "8" + # distribution: "zulu" + # java-package: "jdk+fx" + # architecture: "x64" + # check-latest: true # - name: Install ant # run: brew install ant - - name: Log environment variables & JAVA_HOME - run: | - echo $JAVA_HOME - printenv - - name: Create Contents/Home - run: mkdir -p $JAVA_HOME/Contents/Home - - name: Create link to jre Contents/Home - run: ln -s ../../jre $JAVA_HOME/Contents/Home/jre + - name: Log JAVA_HOME + run: echo $JAVA_HOME + - name: Show content JAVA_HOME parent + run: ls $JAVA_HOME/.. + - name: Show content JAVA_HOME grandparent + run: ls $JAVA_HOME/../.. + - name: Show content JAVA_HOME grandgrandparent + run: ls $JAVA_HOME/../../.. + - name: Show content JAVA_HOME grandgrandgrandparent + run: ls $JAVA_HOME/../../../.. + # - name: Create Contents/Home + # run: mkdir -p $JAVA_HOME/Contents/Home + # - name: Create link to jre Contents/Home + # run: ln -s ../../jre $JAVA_HOME/Contents/Home/jre - name: Show content of JAVA_HOME run: ls $JAVA_HOME - - name: Show content of JAVA_HOME/Contents - run: ls $JAVA_HOME/Contents - - name: Show content of JAVA_HOME/Contents/Home - run: ls $JAVA_HOME/Contents/Home - - name: Show content of JAVA_HOME/Contents/Home/jre - run: ls $JAVA_HOME/Contents/Home/jre + # - name: Show content of JAVA_HOME/Contents + # run: ls $JAVA_HOME/Contents + # - name: Show content of JAVA_HOME/Contents/Home + # run: ls $JAVA_HOME/Contents/Home + # - name: Show content of JAVA_HOME/Contents/Home/jre + # run: ls $JAVA_HOME/Contents/Home/jre - name: Show content of JAVA_HOME/bin run: ls $JAVA_HOME/bin - name: Show content of JAVA_HOME/jre run: ls $JAVA_HOME/jre - - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - - name: Release .dmg File - uses: actions/upload-artifact@v3 - with: - name: AsTeRICS ${{ env.VERSION }} (mac) - path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg + # - name: Build AsTeRICS + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + # - name: Release .dmg File + # uses: actions/upload-artifact@v3 + # with: + # name: AsTeRICS ${{ env.VERSION }} (mac) + # path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg From dc16782c2878681010371301a30b81e349d21b53 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 22:59:14 +0100 Subject: [PATCH 37/57] Update release workflow: create link Contents/Home to JAVA_HOME --- .github/workflows/release-mac.yml | 70 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index dc1e3c61a..aa801e90a 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -8,49 +8,51 @@ jobs: steps: - name: Get Code uses: actions/checkout@v3 - - name: Log java version - run: java -version - # - name: Install JDK - # uses: actions/setup-java@v3 - # with: - # java-version: "8" - # distribution: "zulu" - # java-package: "jdk+fx" - # architecture: "x64" - # check-latest: true + # - name: Log java version + # run: java -version + - name: Install JDK + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "zulu" + java-package: "jdk+fx" + architecture: "x64" + check-latest: true # - name: Install ant # run: brew install ant - - name: Log JAVA_HOME - run: echo $JAVA_HOME - - name: Show content JAVA_HOME parent - run: ls $JAVA_HOME/.. - - name: Show content JAVA_HOME grandparent - run: ls $JAVA_HOME/../.. - - name: Show content JAVA_HOME grandgrandparent - run: ls $JAVA_HOME/../../.. - - name: Show content JAVA_HOME grandgrandgrandparent - run: ls $JAVA_HOME/../../../.. + # - name: Log JAVA_HOME + # run: echo $JAVA_HOME + # - name: Show content JAVA_HOME parent + # run: ls $JAVA_HOME/.. + # - name: Show content JAVA_HOME grandparent + # run: ls $JAVA_HOME/../.. + # - name: Show content JAVA_HOME grandgrandparent + # run: ls $JAVA_HOME/../../.. + # - name: Show content JAVA_HOME grandgrandgrandparent + # run: ls $JAVA_HOME/../../../.. # - name: Create Contents/Home # run: mkdir -p $JAVA_HOME/Contents/Home # - name: Create link to jre Contents/Home # run: ln -s ../../jre $JAVA_HOME/Contents/Home/jre - - name: Show content of JAVA_HOME - run: ls $JAVA_HOME + # - name: Show content of JAVA_HOME + # run: ls $JAVA_HOME # - name: Show content of JAVA_HOME/Contents # run: ls $JAVA_HOME/Contents # - name: Show content of JAVA_HOME/Contents/Home # run: ls $JAVA_HOME/Contents/Home # - name: Show content of JAVA_HOME/Contents/Home/jre # run: ls $JAVA_HOME/Contents/Home/jre - - name: Show content of JAVA_HOME/bin - run: ls $JAVA_HOME/bin - - name: Show content of JAVA_HOME/jre - run: ls $JAVA_HOME/jre - # - name: Build AsTeRICS - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - # - name: Release .dmg File - # uses: actions/upload-artifact@v3 - # with: - # name: AsTeRICS ${{ env.VERSION }} (mac) - # path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg + # - name: Show content of JAVA_HOME/bin + # run: ls $JAVA_HOME/bin + # - name: Show content of JAVA_HOME/jre + # run: ls $JAVA_HOME/jre + - name: Create Contents/Home + run: mkdir -p $JAVA_HOME/Contents && ln -s $JAVA_HOME $JAVA_HOME/Contents/Home + - name: Build AsTeRICS + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home + run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + - name: Release .dmg File + uses: actions/upload-artifact@v3 + with: + name: AsTeRICS ${{ env.VERSION }} (mac) + path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg From 1a533d141121c8e5dd246e7dd74e28e8be571fb2 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Wed, 30 Nov 2022 23:16:21 +0100 Subject: [PATCH 38/57] Update release workflow: create directory Contents/Home and link to it --- .github/workflows/release-mac.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index aa801e90a..208bf5ae9 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -47,10 +47,11 @@ jobs: # - name: Show content of JAVA_HOME/jre # run: ls $JAVA_HOME/jre - name: Create Contents/Home - run: mkdir -p $JAVA_HOME/Contents && ln -s $JAVA_HOME $JAVA_HOME/Contents/Home + run: mkdir -p $JAVA_HOME/Contents/Home - name: Build AsTeRICS # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home - run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .dmg File uses: actions/upload-artifact@v3 with: From 365035b7044617cab0213b27a94f314b903cf76a Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 01:26:18 +0100 Subject: [PATCH 39/57] Update release workflow: use preinstalled java for building AsTeRICS --- .github/workflows/release-mac.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 208bf5ae9..7ee624918 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -10,14 +10,14 @@ jobs: uses: actions/checkout@v3 # - name: Log java version # run: java -version - - name: Install JDK - uses: actions/setup-java@v3 - with: - java-version: "8" - distribution: "zulu" - java-package: "jdk+fx" - architecture: "x64" - check-latest: true + # - name: Install JDK + # uses: actions/setup-java@v3 + # with: + # java-version: "8" + # distribution: "zulu" + # java-package: "jdk+fx" + # architecture: "x64" + # check-latest: true # - name: Install ant # run: brew install ant # - name: Log JAVA_HOME @@ -46,8 +46,8 @@ jobs: # run: ls $JAVA_HOME/bin # - name: Show content of JAVA_HOME/jre # run: ls $JAVA_HOME/jre - - name: Create Contents/Home - run: mkdir -p $JAVA_HOME/Contents/Home + # - name: Create Contents/Home + # run: mkdir -p $JAVA_HOME/Contents/Home - name: Build AsTeRICS # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true From 5ffdd407f20b782cd7fb8f5fa0d34760917e7bb4 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 01:36:41 +0100 Subject: [PATCH 40/57] Update release workflow: set JAVA_HOME manually --- .github/workflows/release-mac.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 7ee624918..c802de552 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -2,6 +2,7 @@ name: Release (macOS) on: workflow_dispatch env: VERSION: 4.5 + JAVA_HOME: $JAVA_HOME_8_X64/Contents/Home jobs: mac: runs-on: macos-latest @@ -10,14 +11,14 @@ jobs: uses: actions/checkout@v3 # - name: Log java version # run: java -version - # - name: Install JDK - # uses: actions/setup-java@v3 - # with: - # java-version: "8" - # distribution: "zulu" - # java-package: "jdk+fx" - # architecture: "x64" - # check-latest: true + - name: Install JDK + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "zulu" + java-package: "jdk+fx" + architecture: "x64" + check-latest: true # - name: Install ant # run: brew install ant # - name: Log JAVA_HOME @@ -46,8 +47,8 @@ jobs: # run: ls $JAVA_HOME/bin # - name: Show content of JAVA_HOME/jre # run: ls $JAVA_HOME/jre - # - name: Create Contents/Home - # run: mkdir -p $JAVA_HOME/Contents/Home + - name: Create Contents/Home + run: mkdir -p $JAVA_HOME/Contents/Home - name: Build AsTeRICS # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true From 0ef7542e621a866d080c1136280f881d9e3676c3 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 01:42:27 +0100 Subject: [PATCH 41/57] Update release workflow: set link and basedir --- .github/workflows/release-mac.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index c802de552..e07d44ae7 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -2,7 +2,6 @@ name: Release (macOS) on: workflow_dispatch env: VERSION: 4.5 - JAVA_HOME: $JAVA_HOME_8_X64/Contents/Home jobs: mac: runs-on: macos-latest @@ -47,12 +46,14 @@ jobs: # run: ls $JAVA_HOME/bin # - name: Show content of JAVA_HOME/jre # run: ls $JAVA_HOME/jre - - name: Create Contents/Home - run: mkdir -p $JAVA_HOME/Contents/Home + - name: Create Contents + run: mkdir -p $JAVA_HOME/Contents + - name: Create link jre + run: ln -s $JAVA_HOME $JAVA_HOME/Contents/Home - name: Build AsTeRICS - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .dmg File uses: actions/upload-artifact@v3 with: From d02a15ca59f97f56b53e764e01c25a36d6443eb9 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 16:18:58 +0100 Subject: [PATCH 42/57] Update release workflow: use oracle jdk --- .github/workflows/release-mac.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index e07d44ae7..0ebc3c51d 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -14,7 +14,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: "8" - distribution: "zulu" + distribution: "oracle" java-package: "jdk+fx" architecture: "x64" check-latest: true @@ -46,10 +46,10 @@ jobs: # run: ls $JAVA_HOME/bin # - name: Show content of JAVA_HOME/jre # run: ls $JAVA_HOME/jre - - name: Create Contents - run: mkdir -p $JAVA_HOME/Contents - - name: Create link jre - run: ln -s $JAVA_HOME $JAVA_HOME/Contents/Home + # - name: Create Contents + # run: mkdir -p $JAVA_HOME/Contents + # - name: Create link jre + # run: ln -s $JAVA_HOME $JAVA_HOME/Contents/Home - name: Build AsTeRICS run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true From 3a6141972f80ca4279af88e9af1a5a85262f771e Mon Sep 17 00:00:00 2001 From: Alija Date: Thu, 1 Dec 2022 17:46:51 +0100 Subject: [PATCH 43/57] Update release workflow: use jdk package instead of jdk-fx --- .github/workflows/release-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 0ebc3c51d..bf5bf484b 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -15,7 +15,7 @@ jobs: with: java-version: "8" distribution: "oracle" - java-package: "jdk+fx" + java-package: "jdk" architecture: "x64" check-latest: true # - name: Install ant From e921f98f42f58cdeb715a2a0d6040731f98fa92e Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 20:00:27 +0100 Subject: [PATCH 44/57] Update release workflow: move zulu jdk in folder containing Contents/Home --- .github/workflows/release-mac.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index bf5bf484b..9b2d13a81 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -14,8 +14,8 @@ jobs: uses: actions/setup-java@v3 with: java-version: "8" - distribution: "oracle" - java-package: "jdk" + distribution: "zulu" + java-package: "jdk+fx" architecture: "x64" check-latest: true # - name: Install ant @@ -50,12 +50,20 @@ jobs: # run: mkdir -p $JAVA_HOME/Contents # - name: Create link jre # run: ln -s $JAVA_HOME $JAVA_HOME/Contents/Home + - name: Move JDK + run: | + shopt -s extglob + mkdir -p $JAVA_HOME/Contents/Home + cp -r $JAVA_HOME/!(Contents) $JAVA_HOME/Contents/Home/ + # run: mkdir $JAVA_HOME/../Home && mv $JAVA_HOME/* $JAVA_HOME/../Home/ && mkdir $JAVA_HOME/Contents && mv $JAVA_HOME/../Home $JAVA_HOME/Contents/ - name: Build AsTeRICS - run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home + env: + JAVA_HOME: ${{ env.JAVA_HOME_8_X64 }}/Contents/Home + # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true + run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .dmg File uses: actions/upload-artifact@v3 with: name: AsTeRICS ${{ env.VERSION }} (mac) - path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.dmg + path: Installer/asterics-are/build/deploy/bundles/asterics-are-javaembedded-${{ env.VERSION }}.dmg From 89523dc28cb69f8c5a2f750a8092b1cd0b1dd8a6 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 20:45:04 +0100 Subject: [PATCH 45/57] Update release workflow: rename jobs, streamline names, and windows install step --- .github/workflows/release-linux.yml | 13 ++++--- .github/workflows/release-mac.yml | 50 ++++++--------------------- .github/workflows/release-windows.yml | 17 +++++++-- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index a37394450..cd02f2785 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -2,8 +2,9 @@ name: Release (Linux) on: workflow_dispatch env: VERSION: 4.5 + ARTIFACT: AsTeRICS 4.5 (linux) jobs: - linux: + build: runs-on: ubuntu-latest steps: - name: Get Code @@ -16,23 +17,21 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - # - name: Install ant - # run: sudo apt install ant -y - name: Build AsTeRICS run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=deb -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .deb File uses: actions/upload-artifact@v3 with: - name: AsTeRICS ${{ env.VERSION }} (linux) + name: ${{ env.ARTIFACT }} path: Installer/asterics-are/build/deploy/bundles/asterics-are-${{ env.VERSION }}.deb - linux-install: - needs: linux + install: + needs: build runs-on: ubuntu-latest steps: - name: Get Software uses: actions/download-artifact@v3 with: - name: AsTeRICS ${{ env.VERSION }} (linux) + name: ${{ env.ARTIFACT }} - name: Setup Machine run: sudo mkdir /usr/share/desktop-directories - name: Install Package diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 9b2d13a81..c450c6673 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -2,14 +2,13 @@ name: Release (macOS) on: workflow_dispatch env: VERSION: 4.5 + ARTIFACT: AsTeRICS 4.5 (macOS) jobs: - mac: + build: runs-on: macos-latest steps: - name: Get Code uses: actions/checkout@v3 - # - name: Log java version - # run: java -version - name: Install JDK uses: actions/setup-java@v3 with: @@ -18,52 +17,25 @@ jobs: java-package: "jdk+fx" architecture: "x64" check-latest: true - # - name: Install ant - # run: brew install ant - # - name: Log JAVA_HOME - # run: echo $JAVA_HOME - # - name: Show content JAVA_HOME parent - # run: ls $JAVA_HOME/.. - # - name: Show content JAVA_HOME grandparent - # run: ls $JAVA_HOME/../.. - # - name: Show content JAVA_HOME grandgrandparent - # run: ls $JAVA_HOME/../../.. - # - name: Show content JAVA_HOME grandgrandgrandparent - # run: ls $JAVA_HOME/../../../.. - # - name: Create Contents/Home - # run: mkdir -p $JAVA_HOME/Contents/Home - # - name: Create link to jre Contents/Home - # run: ln -s ../../jre $JAVA_HOME/Contents/Home/jre - # - name: Show content of JAVA_HOME - # run: ls $JAVA_HOME - # - name: Show content of JAVA_HOME/Contents - # run: ls $JAVA_HOME/Contents - # - name: Show content of JAVA_HOME/Contents/Home - # run: ls $JAVA_HOME/Contents/Home - # - name: Show content of JAVA_HOME/Contents/Home/jre - # run: ls $JAVA_HOME/Contents/Home/jre - # - name: Show content of JAVA_HOME/bin - # run: ls $JAVA_HOME/bin - # - name: Show content of JAVA_HOME/jre - # run: ls $JAVA_HOME/jre - # - name: Create Contents - # run: mkdir -p $JAVA_HOME/Contents - # - name: Create link jre - # run: ln -s $JAVA_HOME $JAVA_HOME/Contents/Home - name: Move JDK run: | shopt -s extglob mkdir -p $JAVA_HOME/Contents/Home cp -r $JAVA_HOME/!(Contents) $JAVA_HOME/Contents/Home/ - # run: mkdir $JAVA_HOME/../Home && mv $JAVA_HOME/* $JAVA_HOME/../Home/ && mkdir $JAVA_HOME/Contents && mv $JAVA_HOME/../Home $JAVA_HOME/Contents/ - name: Build AsTeRICS env: JAVA_HOME: ${{ env.JAVA_HOME_8_X64 }}/Contents/Home - # run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true -Dfx.platform.basedir=$JAVA_HOME/Contents/Home - # run: JAVA_HOME=$JAVA_HOME/Contents/Home ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true run: ant -buildfile Installer/asterics-are/build.xml deploy -Dfx.deploy.nativeBundles=dmg -DAPE.embedJava=true -Dfx.application.version=$VERSION -Dfx.deploy.verbose=true - name: Release .dmg File uses: actions/upload-artifact@v3 with: - name: AsTeRICS ${{ env.VERSION }} (mac) + name: ${{ env.ARTIFACT }} path: Installer/asterics-are/build/deploy/bundles/asterics-are-javaembedded-${{ env.VERSION }}.dmg + install: + needs: build + runs-on: macos-latest + steps: + - name: Get Software + uses: actions/download-artifact@v3 + with: + name: ${{ env.ARTIFACT }} diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index eb577ead3..bf2e64b63 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -2,8 +2,9 @@ name: Release (Windows) on: workflow_dispatch env: VERSION: 4.5 + ARTIFACT: AsTeRICS 4.5 (windows) jobs: - windows: + build: runs-on: windows-latest steps: - name: Show Windows Version @@ -23,5 +24,17 @@ jobs: - name: Release .exe File uses: actions/upload-artifact@v3 with: - name: AsTeRICS ${{ env.VERSION }} (windows) + name: ${{ env.ARTIFACT }} path: Setup_AsTeRICS_${{ env.VERSION }}.exe + install: + needs: build + runs-on: windows-latest + steps: + - name: Get Software + uses: actions/download-artifact@v3 + with: + name: ${{ env.ARTIFACT }} + - name: List directory content + run: dir + - name: Install Package + run: start Setup_AsTeRICS_${{ env.VERSION }}.exe From 68ad56c1336d859655e4eae945cadf7bb1e8c113 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Thu, 1 Dec 2022 22:40:47 +0100 Subject: [PATCH 46/57] Update release workflow: create combined workflow --- .github/workflows/release-linux.yml | 2 +- .github/workflows/release-mac.yml | 2 +- .github/workflows/release-windows.yml | 2 +- .github/workflows/release.yml | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index cd02f2785..f79cd1ce8 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -1,5 +1,5 @@ name: Release (Linux) -on: workflow_dispatch +on: [workflow_dispatch, workflow_call] env: VERSION: 4.5 ARTIFACT: AsTeRICS 4.5 (linux) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index c450c6673..a02dbf702 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -1,5 +1,5 @@ name: Release (macOS) -on: workflow_dispatch +on: [workflow_dispatch, workflow_call] env: VERSION: 4.5 ARTIFACT: AsTeRICS 4.5 (macOS) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index bf2e64b63..3feb28ba3 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -1,5 +1,5 @@ name: Release (Windows) -on: workflow_dispatch +on: [workflow_dispatch, workflow_call] env: VERSION: 4.5 ARTIFACT: AsTeRICS 4.5 (windows) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..499e62895 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,9 @@ +name: Release +on: workflow_dispatch +jobs: + linux: + uses: ./.github/workflows/release-linux.yml + windows: + uses: ./.github/workflows/release-windows.yml + mac: + uses: ./.github/workflows/release-mac.yml From 6b27aee75dfaf70204ccbe87dd840542da3db0d4 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 08:51:49 +0100 Subject: [PATCH 47/57] Update release workflow: add inputs --- .github/workflows/release-linux.yml | 35 +++++++++++++++++++++++++---- .github/workflows/release.yml | 3 +++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index f79cd1ce8..62427e11e 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -1,11 +1,38 @@ name: Release (Linux) -on: [workflow_dispatch, workflow_call] +on: + workflow_dispatch: + inputs: + version: + description: "Version Number" + required: true + type: string + platform: + description: "Platform Type" + required: false + default: ubuntu-latest + type: choice + options: + - ubuntu-latest + - ubuntu-22.04 + - ubuntu-20.04 + - ubuntu-18.04 + workflow_call: + inputs: + version: + description: "Version Number" + required: true + type: number + platform: + description: "Platform Type" + default: ubuntu-latest + required: true + type: string env: - VERSION: 4.5 - ARTIFACT: AsTeRICS 4.5 (linux) + VERSION: ${{ inputs.version }} + ARTIFACT: AsTeRICS ${{ inputs.version }} (${{ inputs.platform }}) jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ inputs.platform }} steps: - name: Get Code uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 499e62895..cb102ee7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,9 @@ on: workflow_dispatch jobs: linux: uses: ./.github/workflows/release-linux.yml + with: + version: 4.7 + platform: ubuntu-20.04 windows: uses: ./.github/workflows/release-windows.yml mac: From db996a1d5f6cbc61fab88c384ad3bdc4e6f79396 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 09:21:11 +0100 Subject: [PATCH 48/57] Update release workflow: add and use inputs for main release workflow --- .github/workflows/release-mac.yml | 35 +++++++++++++++++--- .github/workflows/release-windows.yml | 34 ++++++++++++++++--- .github/workflows/release.yml | 47 +++++++++++++++++++++++++-- 3 files changed, 105 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index a02dbf702..740923a0e 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -1,11 +1,38 @@ name: Release (macOS) -on: [workflow_dispatch, workflow_call] +on: + workflow_dispatch: + inputs: + version: + description: "Version Number" + required: true + type: string + platform: + description: "Platform Type" + required: false + default: macos-latest + type: choice + options: + - macos-latest + - macos-12 + - macos-11 + - macos-10.15 + workflow_call: + inputs: + version: + description: "Version Number" + required: true + type: number + platform: + description: "Platform Type" + default: macos-latest + required: true + type: string env: - VERSION: 4.5 - ARTIFACT: AsTeRICS 4.5 (macOS) + VERSION: ${{ inputs.version }} + ARTIFACT: AsTeRICS ${{ inputs.version }} (${{ inputs.platform }}) jobs: build: - runs-on: macos-latest + runs-on: ${{ inputs.platform }} steps: - name: Get Code uses: actions/checkout@v3 diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 3feb28ba3..c1d3f8835 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -1,11 +1,37 @@ name: Release (Windows) -on: [workflow_dispatch, workflow_call] +on: + workflow_dispatch: + inputs: + version: + description: "Version Number" + required: true + type: string + platform: + description: "Platform Type" + required: false + default: windows-latest + type: choice + options: + - windows-latest + - windows-2022 + - windows-2019 + workflow_call: + inputs: + version: + description: "Version Number" + required: true + type: number + platform: + description: "Platform Type" + default: windows-latest + required: true + type: string env: - VERSION: 4.5 - ARTIFACT: AsTeRICS 4.5 (windows) + VERSION: ${{ inputs.version }} + ARTIFACT: AsTeRICS ${{ inputs.version }} (${{ inputs.platform }}) jobs: build: - runs-on: windows-latest + runs-on: ${{ inputs.platform }} steps: - name: Show Windows Version run: systeminfo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb102ee7d..dd55fc6d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,53 @@ name: Release -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + version: + description: "Version Number" + required: true + type: string + linux: + description: "Linux Platform Type" + required: false + default: ubuntu-latest + type: choice + options: + - ubuntu-latest + - ubuntu-22.04 + - ubuntu-20.04 + - ubuntu-18.04 + windows: + description: "Windows Platform Type" + required: false + default: windows-latest + type: choice + options: + - windows-latest + - windows-2022 + - windows-2019 + macOS: + description: "macOS Platform Type" + required: false + default: macos-latest + type: choice + options: + - macos-latest + - macos-12 + - macos-11 + - macos-10.15 jobs: linux: uses: ./.github/workflows/release-linux.yml with: - version: 4.7 - platform: ubuntu-20.04 + version: ${{ inputs.version }} + platform: ${{ inputs.linux }} windows: uses: ./.github/workflows/release-windows.yml + with: + version: ${{ inputs.version }} + platform: ${{ inputs.windows }} mac: uses: ./.github/workflows/release-mac.yml + with: + version: ${{ inputs.version }} + platform: ${{ inputs.macOS }} From 0bf9a5f1ec2686de258da48d12b39a3cb97c4ee7 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 09:28:26 +0100 Subject: [PATCH 49/57] Update release workflow: remove windows systeminfo log --- .github/workflows/release-windows.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index c1d3f8835..032bf23c1 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -33,8 +33,6 @@ jobs: build: runs-on: ${{ inputs.platform }} steps: - - name: Show Windows Version - run: systeminfo - name: Get Code uses: actions/checkout@v3 - name: Install JDK From da150b1ce096a61dd7657d8a5df474fc3cb85906 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 09:29:53 +0100 Subject: [PATCH 50/57] Update release workflow: use parameter type string instead of number for version --- .github/workflows/release-linux.yml | 2 +- .github/workflows/release-mac.yml | 2 +- .github/workflows/release-windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 62427e11e..aae1a80fe 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -21,7 +21,7 @@ on: version: description: "Version Number" required: true - type: number + type: string platform: description: "Platform Type" default: ubuntu-latest diff --git a/.github/workflows/release-mac.yml b/.github/workflows/release-mac.yml index 740923a0e..1410c8943 100644 --- a/.github/workflows/release-mac.yml +++ b/.github/workflows/release-mac.yml @@ -21,7 +21,7 @@ on: version: description: "Version Number" required: true - type: number + type: string platform: description: "Platform Type" default: macos-latest diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 032bf23c1..b5f83ee38 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -20,7 +20,7 @@ on: version: description: "Version Number" required: true - type: number + type: string platform: description: "Platform Type" default: windows-latest From beb83763fbae98a86366f387c69789319a3cad12 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 11:12:13 +0100 Subject: [PATCH 51/57] Update release workflow: schedule release --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd55fc6d7..368eedc00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,7 @@ name: Release on: + schedule: + - cron: "*/15 * * * *" workflow_dispatch: inputs: version: From 6b9a97f85caa153dfcf0256d1458c41c631d47fa Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Fri, 2 Dec 2022 13:30:46 +0100 Subject: [PATCH 52/57] Update release workflow: separate scheduled workflow --- .github/workflows/release-scheduled.yml | 32 +++++++++++++++++++++++++ .github/workflows/release.yml | 2 -- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release-scheduled.yml diff --git a/.github/workflows/release-scheduled.yml b/.github/workflows/release-scheduled.yml new file mode 100644 index 000000000..1705c29de --- /dev/null +++ b/.github/workflows/release-scheduled.yml @@ -0,0 +1,32 @@ +name: Release (cron) +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: +env: + VERSION: 4.8 +jobs: + linux: + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] + uses: ./.github/workflows/release-linux.yml + with: + version: 4.8 + platform: ${{ matrix.os }} + windows: + strategy: + matrix: + os: [windows-2022, windows-2019] + uses: ./.github/workflows/release-windows.yml + with: + version: 4.8 + platform: ${{ matrix.os }} + mac: + strategy: + matrix: + os: [macos-12, macos-11, macos-10.15] + uses: ./.github/workflows/release-mac.yml + with: + version: 4.8 + platform: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 368eedc00..dd55fc6d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,5 @@ name: Release on: - schedule: - - cron: "*/15 * * * *" workflow_dispatch: inputs: version: From 465341c5be0e6c2e263c55ede7f22b4245a76ae4 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Sat, 3 Dec 2022 19:21:52 +0100 Subject: [PATCH 53/57] Update release workflow: generate version from timestamp --- .github/workflows/release-scheduled.yml | 70 +++++++++++++++++-------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release-scheduled.yml b/.github/workflows/release-scheduled.yml index 1705c29de..46193e0d1 100644 --- a/.github/workflows/release-scheduled.yml +++ b/.github/workflows/release-scheduled.yml @@ -1,32 +1,56 @@ name: Release (cron) on: schedule: - - cron: "0 0 * * *" + - cron: "*/5 * * * *" workflow_dispatch: + inputs: + version: + description: "Version Number" + type: string env: VERSION: 4.8 jobs: - linux: + version: + if: ${{ github.event_name == 'schedule' }} + runs-on: ubuntu-latest + outputs: + version: ${{ steps.version.outputs.version }} + steps: + - name: Log Version + run: date +'%Y%m%d-%H%M' + - name: Output Version + id: version + run: echo "version=$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT + test: strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] - uses: ./.github/workflows/release-linux.yml - with: - version: 4.8 - platform: ${{ matrix.os }} - windows: - strategy: - matrix: - os: [windows-2022, windows-2019] - uses: ./.github/workflows/release-windows.yml - with: - version: 4.8 - platform: ${{ matrix.os }} - mac: - strategy: - matrix: - os: [macos-12, macos-11, macos-10.15] - uses: ./.github/workflows/release-mac.yml - with: - version: 4.8 - platform: ${{ matrix.os }} + os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} + needs: version + steps: + - name: Log version ${{ needs.version.outputs.version }} + run: echo ${{ needs.version.outputs.version }} + # linux: + # strategy: + # matrix: + # os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] + # uses: ./.github/workflows/release-linux.yml + # with: + # version: 4.8 + # platform: ${{ matrix.os }} + # windows: + # strategy: + # matrix: + # os: [windows-2022, windows-2019] + # uses: ./.github/workflows/release-windows.yml + # with: + # version: 4.8 + # platform: ${{ matrix.os }} + # mac: + # strategy: + # matrix: + # os: [macos-12, macos-11, macos-10.15] + # uses: ./.github/workflows/release-mac.yml + # with: + # version: 4.8 + # platform: ${{ matrix.os }} From 008d8eac0a49291d65e26d208f97c44de344585d Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Sat, 3 Dec 2022 19:52:32 +0100 Subject: [PATCH 54/57] Update release workflow: generate version from tag --- .github/workflows/release-scheduled.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-scheduled.yml b/.github/workflows/release-scheduled.yml index 46193e0d1..9372b6cfd 100644 --- a/.github/workflows/release-scheduled.yml +++ b/.github/workflows/release-scheduled.yml @@ -7,20 +7,29 @@ on: version: description: "Version Number" type: string + push: + tags: + - v[0-9]+.[0-9]+.[0-9]+ env: VERSION: 4.8 jobs: version: - if: ${{ github.event_name == 'schedule' }} runs-on: ubuntu-latest outputs: - version: ${{ steps.version.outputs.version }} + version: ${{ steps.version.outputs.version || steps.custom.outputs.version || steps.tag.outputs.version }} steps: - - name: Log Version - run: date +'%Y%m%d-%H%M' - name: Output Version id: version + if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version == '' ) }} run: echo "version=$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT + - name: Output Custom Version + id: custom + if: ${{ github.event_name == 'workflow_dispatch' && inputs.version != '' }} + run: echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT + - name: Output Tag + id: tag + if: ${{ github.event_name == 'push' }} + run: echo "version=$(echo ${GITHUB_REF#refs/*/} | sed -e 's/v//')" >> $GITHUB_OUTPUT test: strategy: matrix: From b914a45f0bb14c5a0d1b0b6561001ba7e6218366 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Sat, 3 Dec 2022 20:27:02 +0100 Subject: [PATCH 55/57] Update release workflow: build all variants with matrix --- .github/workflows/release-scheduled.yml | 47 ++++++++++++++++++++----- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-scheduled.yml b/.github/workflows/release-scheduled.yml index 9372b6cfd..a44986ea2 100644 --- a/.github/workflows/release-scheduled.yml +++ b/.github/workflows/release-scheduled.yml @@ -10,8 +10,6 @@ on: push: tags: - v[0-9]+.[0-9]+.[0-9]+ -env: - VERSION: 4.8 jobs: version: runs-on: ubuntu-latest @@ -30,15 +28,48 @@ jobs: id: tag if: ${{ github.event_name == 'push' }} run: echo "version=$(echo ${GITHUB_REF#refs/*/} | sed -e 's/v//')" >> $GITHUB_OUTPUT - test: + # test: + # strategy: + # matrix: + # os: [ubuntu-latest, windows-latest, macos-latest] + # runs-on: ${{ matrix.os }} + # needs: version + # steps: + # - name: Log version ${{ needs.version.outputs.version }} + # run: echo ${{ needs.version.outputs.version }} + build: + needs: version + runs-on: ${{ matrix.config.version }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - runs-on: ${{ matrix.os }} - needs: version + config: + - { os: linux, version: ubuntu-22.04 } + - { os: linux, version: ubuntu-20.04 } + - { os: linux, version: ubuntu-18.04 } + - { os: windows, version: windows-2022 } + - { os: windows, version: windows-2019 } + - { os: macOS, version: macos-12 } + - { os: macOS, version: macos-11 } + - { os: macOS, version: macos-10.15 } steps: - - name: Log version ${{ needs.version.outputs.version }} - run: echo ${{ needs.version.outputs.version }} + - name: Build (Linux) + if: ${{ matrix.config.os == 'linux' }} + uses: ./.github/workflows/release-linux.yml + with: + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.config.version }} + - name: Build (Windows) + if: ${{ matrix.config.os == 'windows' }} + uses: ./.github/workflows/release-windows.yml + with: + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.config.version }} + - name: Build (macOS) + if: ${{ matrix.config.os == 'macOS' }} + uses: ./.github/workflows/release-mac.yml + with: + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.config.version }} # linux: # strategy: # matrix: From 8f18974fc791b003c33e8de32319ca72139df076 Mon Sep 17 00:00:00 2001 From: Alija Sabic Date: Sat, 3 Dec 2022 22:11:19 +0100 Subject: [PATCH 56/57] Update release workflow: setup builds for all supported operating systems (dispatch, cron, tag) --- .github/workflows/release-scheduled.yml | 96 ------------------------- .github/workflows/release.yml | 76 ++++++++++---------- 2 files changed, 40 insertions(+), 132 deletions(-) delete mode 100644 .github/workflows/release-scheduled.yml diff --git a/.github/workflows/release-scheduled.yml b/.github/workflows/release-scheduled.yml deleted file mode 100644 index a44986ea2..000000000 --- a/.github/workflows/release-scheduled.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: Release (cron) -on: - schedule: - - cron: "*/5 * * * *" - workflow_dispatch: - inputs: - version: - description: "Version Number" - type: string - push: - tags: - - v[0-9]+.[0-9]+.[0-9]+ -jobs: - version: - runs-on: ubuntu-latest - outputs: - version: ${{ steps.version.outputs.version || steps.custom.outputs.version || steps.tag.outputs.version }} - steps: - - name: Output Version - id: version - if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version == '' ) }} - run: echo "version=$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT - - name: Output Custom Version - id: custom - if: ${{ github.event_name == 'workflow_dispatch' && inputs.version != '' }} - run: echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT - - name: Output Tag - id: tag - if: ${{ github.event_name == 'push' }} - run: echo "version=$(echo ${GITHUB_REF#refs/*/} | sed -e 's/v//')" >> $GITHUB_OUTPUT - # test: - # strategy: - # matrix: - # os: [ubuntu-latest, windows-latest, macos-latest] - # runs-on: ${{ matrix.os }} - # needs: version - # steps: - # - name: Log version ${{ needs.version.outputs.version }} - # run: echo ${{ needs.version.outputs.version }} - build: - needs: version - runs-on: ${{ matrix.config.version }} - strategy: - matrix: - config: - - { os: linux, version: ubuntu-22.04 } - - { os: linux, version: ubuntu-20.04 } - - { os: linux, version: ubuntu-18.04 } - - { os: windows, version: windows-2022 } - - { os: windows, version: windows-2019 } - - { os: macOS, version: macos-12 } - - { os: macOS, version: macos-11 } - - { os: macOS, version: macos-10.15 } - steps: - - name: Build (Linux) - if: ${{ matrix.config.os == 'linux' }} - uses: ./.github/workflows/release-linux.yml - with: - version: ${{ needs.version.outputs.version }} - platform: ${{ matrix.config.version }} - - name: Build (Windows) - if: ${{ matrix.config.os == 'windows' }} - uses: ./.github/workflows/release-windows.yml - with: - version: ${{ needs.version.outputs.version }} - platform: ${{ matrix.config.version }} - - name: Build (macOS) - if: ${{ matrix.config.os == 'macOS' }} - uses: ./.github/workflows/release-mac.yml - with: - version: ${{ needs.version.outputs.version }} - platform: ${{ matrix.config.version }} - # linux: - # strategy: - # matrix: - # os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] - # uses: ./.github/workflows/release-linux.yml - # with: - # version: 4.8 - # platform: ${{ matrix.os }} - # windows: - # strategy: - # matrix: - # os: [windows-2022, windows-2019] - # uses: ./.github/workflows/release-windows.yml - # with: - # version: 4.8 - # platform: ${{ matrix.os }} - # mac: - # strategy: - # matrix: - # os: [macos-12, macos-11, macos-10.15] - # uses: ./.github/workflows/release-mac.yml - # with: - # version: 4.8 - # platform: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd55fc6d7..a0a8b339f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,53 +1,57 @@ name: Release on: + schedule: + - cron: "0 12 * * *" workflow_dispatch: inputs: version: description: "Version Number" - required: true type: string - linux: - description: "Linux Platform Type" - required: false - default: ubuntu-latest - type: choice - options: - - ubuntu-latest - - ubuntu-22.04 - - ubuntu-20.04 - - ubuntu-18.04 - windows: - description: "Windows Platform Type" - required: false - default: windows-latest - type: choice - options: - - windows-latest - - windows-2022 - - windows-2019 - macOS: - description: "macOS Platform Type" - required: false - default: macos-latest - type: choice - options: - - macos-latest - - macos-12 - - macos-11 - - macos-10.15 + push: + tags: + - v[0-9]+.[0-9]+.[0-9]+ jobs: + version: + runs-on: ubuntu-latest + outputs: + version: ${{ steps.version.outputs.version || steps.custom.outputs.version || steps.tag.outputs.version }} + steps: + - name: Output Version + id: version + if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version == '' ) }} + run: echo "version=$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT + - name: Output Custom Version + id: custom + if: ${{ github.event_name == 'workflow_dispatch' && inputs.version != '' }} + run: echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT + - name: Output Tag + id: tag + if: ${{ github.event_name == 'push' }} + run: echo "version=$(echo ${GITHUB_REF#refs/*/} | sed -e 's/v//')" >> $GITHUB_OUTPUT linux: + needs: version + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] uses: ./.github/workflows/release-linux.yml with: - version: ${{ inputs.version }} - platform: ${{ inputs.linux }} + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.os }} windows: + needs: version + strategy: + matrix: + os: [windows-2022, windows-2019] uses: ./.github/workflows/release-windows.yml with: - version: ${{ inputs.version }} - platform: ${{ inputs.windows }} + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.os }} mac: + needs: version + strategy: + matrix: + os: [macos-12, macos-11, macos-10.15] uses: ./.github/workflows/release-mac.yml with: - version: ${{ inputs.version }} - platform: ${{ inputs.macOS }} + version: ${{ needs.version.outputs.version }} + platform: ${{ matrix.os }} From 06879cd182d19fa7ee5d8816409dc7b0bd1eb9ff Mon Sep 17 00:00:00 2001 From: deinhofer Date: Wed, 20 Dec 2023 12:19:01 +0100 Subject: [PATCH 57/57] removed ubuntu 18.04, mac os 10.15 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0a8b339f..a549ebf02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: needs: version strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] + os: [ubuntu-22.04, ubuntu-20.04] uses: ./.github/workflows/release-linux.yml with: version: ${{ needs.version.outputs.version }} @@ -50,7 +50,7 @@ jobs: needs: version strategy: matrix: - os: [macos-12, macos-11, macos-10.15] + os: [macos-12, macos-11] uses: ./.github/workflows/release-mac.yml with: version: ${{ needs.version.outputs.version }}