From df16fe208238bcd6b82419ea906b728067265177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Dziedziul?= Date: Thu, 26 Oct 2023 11:49:38 +0200 Subject: [PATCH 1/2] Use JDK 11 for PR tests --- .github/workflows/publish-packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 94377b19..1c5fedc6 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -60,7 +60,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Set HZ_VERSION @@ -109,7 +109,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Download the distribution tar.gz file @@ -178,7 +178,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Install Required tools @@ -267,7 +267,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Download the distribution tar.gz file From 89f450654125e790706cc4a60c84bf6045bc095d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Dziedziul?= Date: Thu, 26 Oct 2023 12:35:28 +0200 Subject: [PATCH 2/2] Make custom-lib optional for RPM packaging --- packages/rpm/hazelcast.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rpm/hazelcast.spec b/packages/rpm/hazelcast.spec index a96ffe83..57a6f235 100644 --- a/packages/rpm/hazelcast.spec +++ b/packages/rpm/hazelcast.spec @@ -60,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT %{__ln_s} %{_prefix}/lib/hazelcast/bin/hz-healthcheck %{buildroot}%{_bindir}/hz-healthcheck %{__ln_s} %{_prefix}/lib/hazelcast/bin/hz-start %{buildroot}%{_bindir}/hz-start %{__ln_s} %{_prefix}/lib/hazelcast/bin/hz-stop %{buildroot}%{_bindir}/hz-stop +# Fix for missing custom-lib +%{__mkdir} -p %{buildroot}%{_prefix}/lib/hazelcast/custom-lib echo 'hazelcastDownloadId=rpm' > "%{buildroot}%{_prefix}/lib/hazelcast/lib/hazelcast-download.properties"