From b21bf9d6ee49677bda061adecaf71bf673644187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Tue, 8 Aug 2023 16:33:56 +0200 Subject: [PATCH] FUSETOOLS2-2163 - upgrade default runtime to Camel K 2.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Pupier --- .github/workflows/insider.yml | 2 +- .github/workflows/main.yml | 2 +- CHANGELOG.md | 1 + src/test/suite/versionUtils.test.ts | 12 ++++++++---- src/versionUtils.ts | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/insider.yml b/.github/workflows/insider.yml index f1d546d94..eec0337a2 100644 --- a/.github/workflows/insider.yml +++ b/.github/workflows/insider.yml @@ -72,7 +72,7 @@ jobs: - name: Configure Kamel (ubuntu) if: matrix.os == 'ubuntu-latest' run: | - curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz + curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-64bit.tar.gz tar -zxvf kamel.tar.gz chmod +x kamel sudo mv kamel /usr/local/bin/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1e016d43..f6c81e85e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,7 +74,7 @@ jobs: - name: Configure Kamel (ubuntu) if: matrix.os == 'ubuntu-latest' run: | - curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz + curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-64bit.tar.gz tar -zxvf kamel.tar.gz chmod +x kamel sudo mv kamel /usr/local/bin/ diff --git a/CHANGELOG.md b/CHANGELOG.md index d22d7998e..0c28def07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to the "vscode-camelk" extension will be documented in this - Requires jbang for java standalone completion. It allows also to get rid of internal dependency to `kamel local` which is removed from kamel 2.x. - Fix Java standalone support on Windows +- Update default runtime version to v2.0.0 ## 0.0.35 diff --git a/src/test/suite/versionUtils.test.ts b/src/test/suite/versionUtils.test.ts index f7b32ed71..6f6b4c4fb 100644 --- a/src/test/suite/versionUtils.test.ts +++ b/src/test/suite/versionUtils.test.ts @@ -94,12 +94,16 @@ suite("VersionUtils check", () => { await validateVersion('1.12.1', Platform.LINUX, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz'); }); - test("validate url for existing 1.12.1 windows version", async () => { - await validateVersion('1.12.1', Platform.WINDOWS, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-windows-64bit.tar.gz'); + test("validate url for existing 2.0.0 version", async () => { + await validateVersion('2.0.0', Platform.LINUX, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-64bit.tar.gz'); }); - test("validate url for existing 1.12.1 MacOS version", async () => { - await validateVersion('1.12.1', Platform.MACOS, 'https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-mac-64bit.tar.gz'); + test("validate url for existing 2.0.0 windows version", async () => { + await validateVersion('2.0.0', Platform.WINDOWS, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-windows-64bit.tar.gz'); + }); + + test("validate url for existing 2.0.0 MacOS version", async () => { + await validateVersion('2.0.0', Platform.MACOS, 'https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-mac-64bit.tar.gz'); }); test("validate invalid url for xyz1 version", async () => { diff --git a/src/versionUtils.ts b/src/versionUtils.ts index 1e4858db3..928cac4cc 100644 --- a/src/versionUtils.ts +++ b/src/versionUtils.ts @@ -25,13 +25,13 @@ import { platform } from './installer'; import fetch from 'cross-fetch'; import { Platform } from './shell'; -export const version = '1.12.1'; //need to retrieve this if possible, but have a default +export const version = '2.0.0'; //need to retrieve this if possible, but have a default /* * Can be retrieved using `curl -i https://api.github.com/repos/apache/camel-k/releases/latest | grep last-modified` * To be updated when updating the default "version" attribute */ -const LAST_MODIFIED_DATE_OF_DEFAULT_VERSION = 'Mon, 12 Jun 2023 08:34:33 GMT'; +const LAST_MODIFIED_DATE_OF_DEFAULT_VERSION = 'Mon, 24 Jul 2023 07:56:50 GMT'; let latestVersionFromOnline: string; export async function testVersionAvailable(versionToUse: string): Promise {