From 91a82d5ca64893f6443a094845babf86ff09d9b8 Mon Sep 17 00:00:00 2001 From: "dirk.tschentscher" Date: Thu, 8 Feb 2024 11:37:24 +0100 Subject: [PATCH] GitHub Actions: Fix "The following actions uses node12 which is deprecated and will be forced to run on node16" --- .github/workflows/linux_installer.yml | 18 +++++++++++------- .github/workflows/linux_native.yml | 10 +++++++--- .github/workflows/mac_installer.yml | 18 +++++++++++------- .github/workflows/mac_native.yml | 10 +++++++--- .github/workflows/maven.yml | 3 ++- .github/workflows/web_deployments.yml | 14 +++++++++----- .github/workflows/win_installer.yml | 18 +++++++++++------- .github/workflows/win_native.yml | 14 +++++++++----- deploy/jpro/pom.xml | 2 +- deploy/webstart/pom.xml | 13 +++++++++++++ 10 files changed, 81 insertions(+), 39 deletions(-) diff --git a/.github/workflows/linux_installer.yml b/.github/workflows/linux_installer.yml index d09b93b..27eb606 100644 --- a/.github/workflows/linux_installer.yml +++ b/.github/workflows/linux_installer.yml @@ -1,8 +1,12 @@ -# This workflow will build a .deb installer +# This workflow will build deb and rpm installers (with jLink'ed jvms) and fat/uber jars name: Linux DEB/RPM installers, executable jars on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: @@ -10,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: @@ -27,7 +31,7 @@ jobs: - name: Copy native .deb to staging run: cp -r ./deploy/jpackagefx/target/installer/*.deb deb-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: linux .deb installer path: deb-staging @@ -37,7 +41,7 @@ jobs: - name: Copy native .rpm to staging run: cp -r ./deploy/jpackagefx/target/installer/*.rpm rpm-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: linux .rpm installer path: rpm-staging @@ -50,7 +54,7 @@ jobs: - name: Copy JARs to staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar jar-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable spring-boot jar for linux path: jar-staging @@ -62,7 +66,7 @@ jobs: - name: Copy JARs to maven-shade-staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar maven-shade-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable maven-shaded jar for linux path: maven-shade-staging diff --git a/.github/workflows/linux_native.yml b/.github/workflows/linux_native.yml index 18efb51..245eb13 100644 --- a/.github/workflows/linux_native.yml +++ b/.github/workflows/linux_native.yml @@ -1,13 +1,17 @@ name: Linux BIN on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gluonhq/setup-graalvm@master # set GITHUB_TOKEN to avoid exceeding GitHub's API rate limit env: @@ -37,7 +41,7 @@ jobs: - name: Copy native client to staging run: cp -r ./deploy/graalvm/target/gluonfx/x86_64-linux/OpenJfxJcrBrowser* staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: linux_binary path: staging diff --git a/.github/workflows/mac_installer.yml b/.github/workflows/mac_installer.yml index 6b114ed..01de299 100644 --- a/.github/workflows/mac_installer.yml +++ b/.github/workflows/mac_installer.yml @@ -1,8 +1,12 @@ -# This workflow will build a .deb installer +# This workflow will build a pkg and dmg installers name: Mac PKG/DMG installers, executable jars on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: @@ -13,7 +17,7 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '14.2' - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: @@ -32,7 +36,7 @@ jobs: - name: Copy native pkg to staging run: cp -r ./deploy/jpackagefx/target/installer/*.pkg pkg-staging - name: Upload pkg - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: mac .pkg installer path: pkg-staging @@ -43,7 +47,7 @@ jobs: - name: Copy native dmg to staging run: cp -r ./deploy/jpackagefx/target/installer/*.dmg dmg-staging - name: Upload dem - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: mac .dmg installer path: dmg-staging @@ -59,7 +63,7 @@ jobs: - name: Copy JARs to staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar jar-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable spring-boot jar for mac path: jar-staging @@ -71,7 +75,7 @@ jobs: - name: Copy JARs to maven-shade-staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar maven-shade-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable maven-shaded jar for mac path: maven-shade-staging diff --git a/.github/workflows/mac_native.yml b/.github/workflows/mac_native.yml index 3d3141b..3065a89 100644 --- a/.github/workflows/mac_native.yml +++ b/.github/workflows/mac_native.yml @@ -1,13 +1,17 @@ name: MacOS BIN on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: runs-on: macOS-12 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gluonhq/setup-graalvm@master # set GITHUB_TOKEN to avoid exceeding GitHub's API rate limit env: @@ -39,7 +43,7 @@ jobs: - name: Copy native client to staging run: cp -r ./deploy/graalvm/target/gluonfx/x86_64-darwin/OpenJfxJcrBrowser* staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: mac_binary path: staging diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 380671c..bb7bd45 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,6 +8,7 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: jobs: build: @@ -15,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: diff --git a/.github/workflows/web_deployments.yml b/.github/workflows/web_deployments.yml index e9375d2..f98447b 100644 --- a/.github/workflows/web_deployments.yml +++ b/.github/workflows/web_deployments.yml @@ -1,8 +1,12 @@ -# This workflow will build a .deb installer +# This workflow will build a jpro-server and a webstart zip with signed jars and jnlp stub name: Web-based deployments, JNLP/JPRO on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: @@ -10,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: @@ -29,7 +33,7 @@ jobs: - name: Copy webstart-zip to staging run: cp -r ./deploy/webstart/target/*.zip webstart-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: webstart zip (needs edit of jnlp inside) path: webstart-staging @@ -42,7 +46,7 @@ jobs: - name: Copy jpro-zip to staging run: cp -r ./deploy/jpro/target/*.zip jpro-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: jpro-server zip path: jpro-staging \ No newline at end of file diff --git a/.github/workflows/win_installer.yml b/.github/workflows/win_installer.yml index 5603209..9ea9db3 100644 --- a/.github/workflows/win_installer.yml +++ b/.github/workflows/win_installer.yml @@ -1,8 +1,12 @@ -# This workflow will build a .deb installer +# This workflow will build msi and Setup.exe installers name: Windows MSI/EXE installers, executable jars on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: @@ -10,7 +14,7 @@ jobs: runs-on: windows-2022 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: @@ -29,7 +33,7 @@ jobs: - name: Copy native msi to staging run: cp -r ./deploy/jpackagefx/target/installer/*.msi msi-staging - name: Upload msi - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: windows msi installer path: msi-staging @@ -40,7 +44,7 @@ jobs: - name: Copy native exe to staging run: cp -r ./deploy/jpackagefx/target/installer/*.exe exe-staging - name: Upload setup exe - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: windows setup.exe style installer path: exe-staging @@ -53,7 +57,7 @@ jobs: - name: Copy JARs to staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar jar-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable spring-boot jar for windows path: jar-staging @@ -65,7 +69,7 @@ jobs: - name: Copy JARs to maven-shade-staging run: cp ./deploy/spring-boot-maven/target/*-fat.jar maven-shade-staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Excecuteable maven-shaded jar for windows path: maven-shade-staging diff --git a/.github/workflows/win_native.yml b/.github/workflows/win_native.yml index c71955f..90317ea 100644 --- a/.github/workflows/win_native.yml +++ b/.github/workflows/win_native.yml @@ -1,17 +1,21 @@ name: Windows EXE on: - workflow_dispatch + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: jobs: build: runs-on: windows-2022 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Visual Studio shell - uses: egor-tensin/vs-shell@v1 + uses: egor-tensin/vs-shell@v2 - name: Setup GraalVM environment uses: gluonhq/setup-graalvm@master # set GITHUB_TOKEN to avoid exceeding GitHub's API rate limit @@ -38,7 +42,7 @@ jobs: - name: Copy native client to staging run: cp -r ./deploy/graalvm/target/gluonfx/x86_64-windows/*.exe staging - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: windows_exe path: staging diff --git a/deploy/jpro/pom.xml b/deploy/jpro/pom.xml index 91810e3..c6ed345 100644 --- a/deploy/jpro/pom.xml +++ b/deploy/jpro/pom.xml @@ -14,7 +14,7 @@ - 2023.1.0 + 2024.1.0 org.motorbrot.javafxjcrbrowser.JavaFxJcrBrowserApplication diff --git a/deploy/webstart/pom.xml b/deploy/webstart/pom.xml index 2ac3862..3c69854 100644 --- a/deploy/webstart/pom.xml +++ b/deploy/webstart/pom.xml @@ -18,6 +18,7 @@ org.motorbrot openjfx-jcr-browser.desktop + compile 1.0.0-SNAPSHOT @@ -25,18 +26,21 @@ org.openjfx javafx-base + compile ${openjfx.version} win org.openjfx javafx-base + compile ${openjfx.version} linux org.openjfx javafx-base + compile ${openjfx.version} mac @@ -44,18 +48,21 @@ org.openjfx javafx-controls + compile ${openjfx.version} win org.openjfx javafx-controls + compile ${openjfx.version} linux org.openjfx javafx-controls + compile ${openjfx.version} mac @@ -63,18 +70,21 @@ org.openjfx javafx-graphics + compile ${openjfx.version} win org.openjfx javafx-graphics + compile ${openjfx.version} linux org.openjfx javafx-graphics + compile ${openjfx.version} mac @@ -82,18 +92,21 @@ org.openjfx javafx-fxml + compile ${openjfx.version} win org.openjfx javafx-fxml + compile ${openjfx.version} linux org.openjfx javafx-fxml + compile ${openjfx.version} mac