Merge pull request quarkusio#193 from quarkusio/graalvm-22.1-21.3.1-2…

…0.3.6 Add modules for GraalVM 22.1.0, 21.3.2 and 20.3.6
galderz · May 2, 2022 · 6dd9337 · 6dd9337
2 parents 0503bda + bab8df2
commit 6dd9337
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 51 deletions.
diff --git a/.github/native-images.yaml b/.github/native-images.yaml
@@ -2,25 +2,23 @@ image: quarkus-native-image.yaml
 imageName: quay.io/quarkus/ubi-quarkus-native-image
 buildScript: .github/build-native-images.sh
 versions:
-  - 21.2.0-java11
-  - 21.2.0-java16
-  - 21.3.0-java11
-  - 21.3.0-java17
-  - 21.3.1-java11
-  - 21.3.1-java17
+  - 21.3.2-java11
+  - 21.3.2-java17
   - 22.0.0-java11
   - 22.0.0-java17
-tags:
-  - id: 21.2-java11
-    target: 21.2.0-java11
-  - id: 21.2-java16
-    target: 21.2.0-java16
+  - 22.1.0-java11
+  - 22.1.0-java17
+tags:  
   - id: 21.3-java11
-    target: 21.3.1-java11
+    target: 21.3.2-java11
   - id: 21.3-java17
-    target: 21.3.1-java17
+    target: 21.3.2-java17
   - id: 22.0-java11
     target: 22.0.0-java11
   - id: 22.0-java17
-    target: 22.0.0-java17
+    target: 22.0.0-java17    
+  - id: 22.1-java11
+    target: 22.1.0-java11
+  - id: 22.1-java17
+    target: 22.1.0-java17        
 versionCheck: true
diff --git a/.github/s2i-native-images.yaml b/.github/s2i-native-images.yaml
@@ -2,22 +2,23 @@ image: quarkus-native-s2i.yaml
 imageName: quay.io/quarkus/ubi-quarkus-native-s2i
 buildScript: .github/build-s2i-native-images.sh
 versions:
-  - 21.2.0-java11
-  - 21.3.0-java11
-  - 21.3.0-java17
-  - 21.3.1-java11
-  - 21.3.1-java17
+  - 21.3.2-java11
+  - 21.3.2-java17
   - 22.0.0-java11
   - 22.0.0-java17
-tags:
-  - id: 21.2-java11
-    target: 21.2.0-java11
+  - 22.1.0-java11
+  - 22.1.0-java17
+tags:  
   - id: 21.3-java11
-    target: 21.3.1-java11
+    target: 21.3.2-java11
   - id: 21.3-java17
-    target: 21.3.1-java17
+    target: 21.3.2-java17
   - id: 22.0-java11
     target: 22.0.0-java11
   - id: 22.0-java17
     target: 22.0.0-java17    
+  - id: 22.1-java11
+    target: 22.1.0-java11
+  - id: 22.1-java17
+    target: 22.1.0-java17        
 versionCheck: false
diff --git a/.github/tooling-images.yaml b/.github/tooling-images.yaml
@@ -2,14 +2,14 @@ image: quarkus-tooling.yaml
 imageName: quay.io/quarkus/centos-quarkus-maven
 buildScript: .github/build-tooling-images.sh
 versions:
-  - 21.2.0-java11
-  - 21.3.1-java11
+  - 21.3.2-java11
   - 22.0.0-java11
+  - 22.1.0-java11
 tags:
-  - id: 21.2-java11
-    target: 21.2.0-java11
   - id: 21.3-java11
-    target: 21.3.1-java11
+    target: 21.3.2-java11
   - id: 22.0-java11
     target: 22.0.0-java11    
+  - id: 22.1-java11
+    target: 22.1.0-java11        
 versionCheck: false
diff --git a/modules/graalvm/20.3.2-java11/configure → modules/graalvm/20.3.6-java11/configure b/modules/graalvm/20.3.2-java11/configure → modules/graalvm/20.3.6-java11/configure
diff --git a/modules/graalvm/20.3.2-java11/module.yaml → modules/graalvm/20.3.6-java11/module.yaml b/modules/graalvm/20.3.2-java11/module.yaml → modules/graalvm/20.3.6-java11/module.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 name: graalvm
-version: &version "20.3.2-java11"
+version: &version "20.3.6-java11"
 
 labels:
   - name: graalvm-archive-filename
-    value: &filename graalvm-ce-linux-amd64-20.3.2-java11.tar.gz
+    value: &filename graalvm-ce-linux-amd64-20.3.6-java11.tar.gz
   - name: graalvm-archive-url
-    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.2/graalvm-ce-java11-linux-amd64-20.3.2.tar.gz
+    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.6/graalvm-ce-java11-linux-amd64-20.3.6.tar.gz
   - name: graalvm-version
-    value:   &suffix java11-20.3.2
+    value:   &suffix java11-20.3.6
 
 envs:
   - name: "JAVA_HOME"
@@ -23,7 +23,7 @@ envs:
 artifacts:
 - name: *filename
   url: *url
-  sha256: f1a6d14ad56277e09cf8888ec4843cac8702e165d90ce9b7ae48ccf183d954b2
+  sha256: 02e5110ec1764e429f097b781ac45d21abd4e61119895275ea6a24321da470ce
 
 packages:
   install:

diff --git a/modules/graalvm/20.3.3-java11/configure → modules/graalvm/21.3.2-java11/configure b/modules/graalvm/20.3.3-java11/configure → modules/graalvm/21.3.2-java11/configure
diff --git a/modules/graalvm/21.3.0-java11/module.yaml → modules/graalvm/21.3.2-java11/module.yaml b/modules/graalvm/21.3.0-java11/module.yaml → modules/graalvm/21.3.2-java11/module.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 name: graalvm
-version: &version "21.3.0-java11"
+version: &version "21.3.2-java11"
 
 labels:
   - name: graalvm-archive-filename
-    value: &filename graalvm-ce-linux-amd64-21.3.0-java11.tar.gz
+    value: &filename graalvm-ce-linux-amd64-21.3.2-java11.tar.gz
   - name: graalvm-archive-url
-    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
+    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.2/graalvm-ce-java11-linux-amd64-21.3.2.tar.gz
   - name: graalvm-version
-    value:   &suffix java11-21.3.0
+    value:   &suffix java11-21.3.2
 
 envs:
   - name: "JAVA_HOME"
@@ -23,7 +23,7 @@ envs:
 artifacts:
 - name: *filename
   url: *url
-  sha256: 3a1bc8eaf0518c128aaacb987ceb0b0e288776f48af630c11c01fd31122d93fa
+  sha256: 1332e2716601abea1e05b7b0b1c643740aedc9a6f82f375f5d2afa7e6323c130
 
 packages:
   install:

diff --git a/modules/graalvm/21.3.0-java11/configure → modules/graalvm/21.3.2-java17/configure b/modules/graalvm/21.3.0-java11/configure → modules/graalvm/21.3.2-java17/configure
diff --git a/modules/graalvm/21.3.0-java17/module.yaml → modules/graalvm/21.3.2-java17/module.yaml b/modules/graalvm/21.3.0-java17/module.yaml → modules/graalvm/21.3.2-java17/module.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 name: graalvm
-version: &version "21.3.0-java17"
+version: &version "21.3.2-java17"
 
 labels:
   - name: graalvm-archive-filename
-    value: &filename graalvm-ce-linux-amd64-21.3.0-java17.tar.gz
+    value: &filename graalvm-ce-linux-amd64-21.3.2-java17.tar.gz
   - name: graalvm-archive-url
-    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java17-linux-amd64-21.3.0.tar.gz
+    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.2/graalvm-ce-java17-linux-amd64-21.3.2.tar.gz
   - name: graalvm-version
-    value:   &suffix java17-21.3.0
+    value:   &suffix java17-21.3.2
 
 envs:
   - name: "JAVA_HOME"
@@ -23,7 +23,7 @@ envs:
 artifacts:
 - name: *filename
   url: *url
-  sha256: 11d8039e0a7a31b799a6f20a0e806e4128730e9a2595a7ffdec1443539d4c3f6
+  sha256: 4df604ac68c7ddf67ac7d8ee7a6d40be0f2ddec89047e8411e2168edeae1b3cd
 
 packages:
   install:

diff --git a/modules/graalvm/21.3.0-java17/configure → modules/graalvm/22.1.0-java11/configure b/modules/graalvm/21.3.0-java17/configure → modules/graalvm/22.1.0-java11/configure
@@ -5,7 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 
 ls -l ${SOURCES_DIR}
 tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt
-mv /opt/graalvm-ce-${GRAALVM_VERSION} /opt/graalvm
+ls -l /opt
+mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm
 
 echo "Installing native-image"
 /opt/graalvm/bin/gu --auto-yes install native-image
diff --git a/modules/graalvm/20.3.3-java11/module.yaml → modules/graalvm/22.1.0-java11/module.yaml b/modules/graalvm/20.3.3-java11/module.yaml → modules/graalvm/22.1.0-java11/module.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 name: graalvm
-version: &version "20.3.3-java11"
+version: &version "22.1.0-java11"
 
 labels:
   - name: graalvm-archive-filename
-    value: &filename graalvm-ce-linux-amd64-20.3.3-java11.tar.gz
+    value: &filename graalvm-ce-linux-amd64-22.1.0-java11.tar.gz
   - name: graalvm-archive-url
-    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.3/graalvm-ce-java11-linux-amd64-20.3.3.tar.gz
+    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-amd64-22.1.0.tar.gz
   - name: graalvm-version
-    value:   &suffix java11-20.3.3
+    value:   &suffix java11-22.1.0
 
 envs:
   - name: "JAVA_HOME"
@@ -17,17 +17,18 @@ envs:
     value: "/opt/graalvm"
   - name: "GRAALVM_VERSION"
     value: *suffix
-  - name: "FILENAME"  
+  - name: "FILENAME"
     value: *filename
 
 artifacts:
 - name: *filename
   url: *url
-  sha256: 93a2e7363cc37277d8fff614d2f1fb59f24cd95203d38d34b897cf145b6b8b65
+  sha256: 78c628707007bb97b09562932ee16f50beb1c3fa4a36e4311a0465a4a718e683
 
 packages:
   install:
   - fontconfig
+  - freetype-devel
 
 execute:
 - script: configure
diff --git a/modules/graalvm/22.1.0-java17/configure b/modules/graalvm/22.1.0-java17/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+ls -l ${SOURCES_DIR}
+tar xzf ${SOURCES_DIR}/${FILENAME} -C /opt
+ls -l /opt
+mv /opt/graalvm-ce-${GRAALVM_VERSION}* /opt/graalvm
+
+echo "Installing native-image"
+/opt/graalvm/bin/gu --auto-yes install native-image
diff --git a/modules/graalvm/22.1.0-java17/module.yaml b/modules/graalvm/22.1.0-java17/module.yaml
@@ -0,0 +1,34 @@
+schema_version: 1
+name: graalvm
+version: &version "22.1.0-java17"
+
+labels:
+  - name: graalvm-archive-filename
+    value: &filename graalvm-ce-linux-amd64-22.1.0-java17.tar.gz
+  - name: graalvm-archive-url
+    value: &url https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-amd64-22.1.0.tar.gz
+  - name: graalvm-version
+    value:   &suffix java17-22.1.0
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/opt/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/opt/graalvm"
+  - name: "GRAALVM_VERSION"
+    value: *suffix
+  - name: "FILENAME"
+    value: *filename
+
+artifacts:
+- name: *filename
+  url: *url
+  sha256: f11d46098efbf78465a875c502028767e3de410a31e45d92a9c5cf5046f42aa2
+
+packages:
+  install:
+  - fontconfig
+  - freetype-devel
+
+execute:
+- script: configure