You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/07/26 12:49:41 UTC
[camel-k] branch main updated (c605ef722 -> 0b926c526)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from c605ef722 chore(deps): bump knative.dev/eventing from 0.37.1 to 0.37.2
new aea6d7c2b chore(ci): default JDK 17 base image
new 0b926c526 fix(ci): add y option
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/e2e-common/exec-tests.sh | 2 +-
.github/actions/kamel-prepare-env/action.yml | 4 ++--
pkg/builder/buildah.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
[camel-k] 02/02: fix(ci): add y option
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0b926c52602bd2d2cc383f58e50d403e36266433
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Jul 26 11:43:02 2023 +0200
fix(ci): add y option
---
.github/actions/e2e-common/exec-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/actions/e2e-common/exec-tests.sh b/.github/actions/e2e-common/exec-tests.sh
index 100da5802..9f02c731f 100755
--- a/.github/actions/e2e-common/exec-tests.sh
+++ b/.github/actions/e2e-common/exec-tests.sh
@@ -25,7 +25,7 @@
set -e
-while getopts ":b:c:g:i:l:n:q:s:v:x:z:" opt; do
+while getopts ":b:c:g:i:l:n:q:s:v:x:y:z:" opt; do
case "${opt}" in
b)
BUILD_CATALOG_SOURCE_NAME=${OPTARG}
[camel-k] 01/02: chore(ci): default JDK 17 base image
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aea6d7c2b728284422dbb600fd53edd3dff54891
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Jul 26 11:27:27 2023 +0200
chore(ci): default JDK 17 base image
---
.github/actions/kamel-prepare-env/action.yml | 4 ++--
pkg/builder/buildah.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/actions/kamel-prepare-env/action.yml b/.github/actions/kamel-prepare-env/action.yml
index dd2fbd1ef..78e169cae 100644
--- a/.github/actions/kamel-prepare-env/action.yml
+++ b/.github/actions/kamel-prepare-env/action.yml
@@ -63,11 +63,11 @@ runs:
echo "Final status:"
df -h
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
if: ${{ env.ENV_PREPARED != 'true' }}
with:
- java-version: '11'
+ java-version: '17'
distribution: 'temurin'
- name: Set up Go
diff --git a/pkg/builder/buildah.go b/pkg/builder/buildah.go
index 43f9c7087..d1ca940cb 100644
--- a/pkg/builder/buildah.go
+++ b/pkg/builder/buildah.go
@@ -20,7 +20,7 @@ package builder
const BuildahPlatform = "BuildahPlatform"
const BuildahImage = "BuildahImage"
const BuildahDefaultImageName = "quay.io/buildah/stable"
-const BuildahDefaultBaseImageName = "docker.io/library/eclipse-temurin:11"
+const BuildahDefaultBaseImageName = "docker.io/library/eclipse-temurin:17"
var buildahSupportedOptions = map[string]PublishStrategyOption{
BuildahPlatform: {
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 747fdcf09..728719d95 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -35,7 +35,7 @@ const (
KanikoVersion = "1.9.1"
// baseImage --
- baseImage = "eclipse-temurin:11"
+ baseImage = "eclipse-temurin:17"
// LocalRepository --
LocalRepository = "/etc/maven/m2"
diff --git a/script/Makefile b/script/Makefile
index d9f3b89f5..d26967e84 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -31,7 +31,7 @@ CODEGEN_VERSION := v0.25.6
OPERATOR_SDK_VERSION := v1.28.0
KUSTOMIZE_VERSION := v4.5.4
OPM_VERSION := v1.24.0
-BASE_IMAGE := eclipse-temurin:11
+BASE_IMAGE := eclipse-temurin:17
LOCAL_REPOSITORY := /etc/maven/m2
IMAGE_NAME ?= docker.io/apache/camel-k
# Default value, change to your architecture accordingly