Aktualisierung install4j auf 9.0.7. Aktualisierung arm Profil auf 64b…

…it. Aktualisierung deploy und build skripte
mediathekview · Jul 17, 2022 · 76ee93e · 76ee93e
1 parent 9dff54a
commit 76ee93e
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 57 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -56,19 +56,19 @@ jobs:
         include:
           - os: linux
             architecture: 64bit
-            maven_profiles: "linux,64bit,install4j"
+            maven_profiles: "linux_64bit,install4j"
           - os: arm
-            architecture: 32bit
-            maven_profiles: "arm,!64bit,32bit,install4j,!linux"
-          - os: windows
             architecture: 64bit
-            maven_profiles: "windows,64bit,install4j,!linux"
+            maven_profiles: "!linux_64bit,linux_arm_64bit,install4j"
           - os: windows
-            architecture: 32bit
-            maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
+            architecture: 64bit
+            maven_profiles: "!linux_64bit,windows_64bit,install4j"
+          # - os: windows
+          #   architecture: 32bit
+          #   maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
           - os: macOS
             architecture: 64bit
-            maven_profiles: "mac,!linux"
+            maven_profiles: "!linux_64bit,mac_intel"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -85,7 +85,7 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,11 +19,11 @@ jobs:
         id: check-if-changed
         with:
           paths: .github/workflows src/ res/ pom.xml .install4j/ .mvn/
-      - name: Set up JDK 17
+      - name: Set up JDK 18
         if: steps.check-if-changed.outputs.changed == 'true'
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 18
 
       - name: Cache local Maven repository
         if: steps.check-if-changed.outputs.changed == 'true'
@@ -57,28 +57,28 @@ jobs:
         include:
           - os: linux
             architecture: 64bit
-            maven_profiles: "linux,64bit,install4j"
+            maven_profiles: "linux_64bit,install4j"
           - os: arm
-            architecture: 32bit
-            maven_profiles: "arm,!64bit,32bit,install4j,!linux"
-          - os: windows
             architecture: 64bit
-            maven_profiles: "windows,64bit,install4j,!linux"
+            maven_profiles: "!linux_64bit,linux_arm_64bit,install4j"
           - os: windows
-            architecture: 32bit
-            maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
-          - os: macOS
             architecture: 64bit
-            maven_profiles: "mac,!linux"
+            maven_profiles: "!linux_64bit,windows_64bit,install4j"
+          # - os: windows
+          #   architecture: 32bit
+          #   maven_profiles: "windows32,!64bit,32bit,install4j,!linux"
+          # - os: macOS
+          #   architecture: 64bit
+          #   maven_profiles: "mac,!linux"
     steps:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 17
+      - name: Set up JDK 18
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '16'
+          java-version: '18'
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
           version: '8'
@@ -87,7 +87,7 @@ jobs:
       - name: Download install4j
         uses: wei/curl@v1
         with:
-          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz' --output install4j.tar.gz
+          args: -fsSL 'https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz' --output install4j.tar.gz
       - name: Extract install4j
         run: tar -zxvf install4j.tar.gz
 
@@ -125,10 +125,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 17
+      - name: Set up JDK 18
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 18
       - name: Get version
         run: echo "VERSION=$( ./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout )" >> $GITHUB_ENV
       - uses: actions/download-artifact@v2

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ default:
     - ssh-keyscan -p 52150 mediathekview.de >> ~/.ssh/known_hosts
     - ssh-keyscan -p 52150 5.1.76.243 >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
-    - wget -q https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_5.tar.gz
-    - tar -zxf install4j_unix_9_0_5.tar.gz
+    - wget -q https://download-gcdn.ej-technologies.com/install4j/install4j_unix_9_0_7.tar.gz -O install4j.tar.gz
+    - tar -zxf install4j.tar.gz
     - java -version
     - ${INSTALL4J_JAVA_HOME}/bin/java -version
     - mvn -v
@@ -34,13 +34,13 @@ stages:
   - deploy-nightly-lin
   - deploy-nightly-linarm
   - deploy-nightly-win
-  - deploy-nightly-win32
+  # - deploy-nightly-win32
   - deploy-nightly-mac
   # - deploy-nightly-mac-as
   - deploy-lin
   - deploy-linarm
   - deploy-win
-  - deploy-win32
+  # - deploy-win32
 
 Build and Deploy nightly Linux:
   stage: deploy-nightly-lin
@@ -56,7 +56,7 @@ Build and Deploy nightly Linux ARM:
   stage: deploy-nightly-linarm
   script:
     - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh nightly linux-armhf $CI_COMMIT_SHA
+    - /skripte/deploy.sh nightly linux-aarch64 $CI_COMMIT_SHA
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
@@ -68,13 +68,13 @@ Build and Deploy nightly Windows:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
-Build and Deploy nightly Windows 32bit:
-  stage: deploy-nightly-win32
-  script:
-    - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh nightly win32 $CI_COMMIT_SHA
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
+# Build and Deploy nightly Windows 32bit:
+#   stage: deploy-nightly-win32
+#   script:
+#     - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
+#     - /skripte/deploy.sh nightly win32 $CI_COMMIT_SHA
+#   rules:
+#     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "develop"'
 
 Build and Deploy nightly Mac Intel:
   stage: deploy-nightly-mac
@@ -108,7 +108,7 @@ Build and Deploy Linux ARM:
   stage: deploy-linarm
   script:
     - mvn -B package -P!linux_64bit,linux_arm_64bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh release linux-armhf
+    - /skripte/deploy.sh release linux-aarch64
   rules:
     - if: $CI_COMMIT_TAG
 
@@ -120,10 +120,10 @@ Build and Deploy Windows:
   rules:
     - if: $CI_COMMIT_TAG
 
-Build and Deploy Windows 32bit:
-  stage: deploy-win32
-  script:
-    - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
-    - /skripte/deploy.sh release win32
-  rules:
-    - if: $CI_COMMIT_TAG
+# Build and Deploy Windows 32bit:
+#   stage: deploy-win32
+#   script:
+#     - mvn -B package -P!linux_64bit,windows_32bit,install4j $MAVEN_CLI_OPTS
+#     - /skripte/deploy.sh release win32
+#   rules:
+#     - if: $CI_COMMIT_TAG
diff --git a/.install4j/mediathekview_arm.install4j b/.install4j/mediathekview_arm.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.5" transformSequenceNumber="9">
+<install4j version="${install4j.version}" transformSequenceNumber="9">
   <directoryPresets config="${project.basedir}/.install4j" />
-  <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux-armhf" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
+  <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux-aarch64" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>
       <principalLanguage id="de" />
     </languages>
@@ -61,7 +61,7 @@
       </iconImageFiles>
     </launcher>
   </launchers>
-  <installerGui autoUpdateDescriptorUrl="https://download.mediathekview.de/stabil/updates-linux-armhf.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://download.mediathekview.de/stabil/">
+  <installerGui autoUpdateDescriptorUrl="https://download.mediathekview.de/stabil/updates-linux-aarch64.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://download.mediathekview.de/stabil/">
     <applications>
       <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication">
         <startup>
@@ -1004,22 +1004,22 @@ return true;</property>
     </styles>
   </installerGui>
   <mediaSets>
-    <unixInstaller name="Unix Installer ARM32" id="161">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <unixInstaller name="Unix Installer ARM64" id="161">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </unixInstaller>
-    <linuxDeb name="Linux Deb Archive ARM32" id="164" maintainerEmail="[email protected]" architectureSet="true" architecture="armhf">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <linuxDeb name="Linux Deb Archive ARM64" id="164" maintainerEmail="[email protected]" architectureSet="true" architecture="aarch64">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>
       </jreBundle>
     </linuxDeb>
-    <unixArchive name="Unix Archive ARM32" id="679">
-      <jreBundle platform="linux-arm32-vfp-hflt">
+    <unixArchive name="Unix Archive ARM64" id="679">
+      <jreBundle platform="linux-aarch64">
         <modules>
           <defaultModules set="all" />
         </modules>

diff --git a/.install4j/mediathekview_linux.install4j b/.install4j/mediathekview_linux.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.5" transformSequenceNumber="9">
+<install4j version="${install4j.version}" transformSequenceNumber="9">
   <directoryPresets config="${project.basedir}/.install4j" />
   <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-linux" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>

diff --git a/.install4j/mediathekview_windows.install4j b/.install4j/mediathekview_windows.install4j
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.5" transformSequenceNumber="9">
+<install4j version="${install4j.version}" transformSequenceNumber="9">
   <directoryPresets config="${project.build.directory}/res" />
   <application name="MediathekView" applicationId="1927-5045-2127-3394" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-win" shortName="MediathekView" publisher="MediathekView Team" publisherWeb="https://mediathekview.de" version="${project.version}" convertDotsToUnderscores="false" macVolumeId="d594baf3c2b3424d" javaMinVersion="${install4j.jdk.min-version}">
     <languages>

diff --git a/pom.xml b/pom.xml
@@ -141,7 +141,7 @@
             -Dfile.encoding=UTF-8 -DexternalUpdateCheck
         </install4j.vmparameters.linux.64>
 
-        <install4j.home>./install4j9.0.5</install4j.home>
+        <install4j.home>./install4j${install4j.version}</install4j.home>
         <!--suppress UnresolvedMavenProperty -->
         <install4j.licenseKey>${env.LICENSE_KEY_9}</install4j.licenseKey>
         <install4j.version>9.0.7</install4j.version>