From 6e68583c630ffb5e97d67658eab2ba39b60eeb4f Mon Sep 17 00:00:00 2001 From: Valerii Svydenko Date: Thu, 25 Jul 2024 15:02:35 +0300 Subject: [PATCH] upgrade openvsx server to 0.16.0; fix import extensions with * vscode engine version (#1958) * upgrade openvsx server to 0.16.0; fix import extensions with * vscode engine version Signed-off-by: Valeriy Svydenko * fix OS ci build Signed-off-by: Valeriy Svydenko --------- Signed-off-by: Valeriy Svydenko --- build/dockerfiles/Dockerfile | 6 +++--- build/dockerfiles/import-vsix.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index fa5c4fde6..3d4147f0a 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2022 Red Hat, Inc. +# Copyright (c) 2018-2024 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -11,8 +11,8 @@ # IBM Corporation - implementation # -# OpenVSX -FROM ghcr.io/eclipse/openvsx-server:v0.14.5 AS openvsx-server +# OpenVSX https://github.com/eclipse/openvsx/pkgs/container/openvsx-server +FROM ghcr.io/eclipse/openvsx-server:v0.16.0 AS openvsx-server # UBI Builder # https://registry.access.redhat.com/ubi8/ubi diff --git a/build/dockerfiles/import-vsix.sh b/build/dockerfiles/import-vsix.sh index d69e5b722..1f3a676c9 100755 --- a/build/dockerfiles/import-vsix.sh +++ b/build/dockerfiles/import-vsix.sh @@ -146,7 +146,7 @@ for i in $(seq 0 "$((numberOfExtensions - 1))"); do vscodeEngineVersion="${vscodeEngineVersion//x/0}" # check if the extension's engine version is compatible with the code version # if the extension's engine version is ahead of the code version, check a next version of the extension - if [[ "$vscodeEngineVersion" = "$(echo -e "$vscodeEngineVersion\n$codeVersion" | sort -V | head -n1)" ]]; then + if [[ "$vscodeEngineVersion" == "*" || "$vscodeEngineVersion" = "$(echo -e "$vscodeEngineVersion\n$codeVersion" | sort -V | head -n1)" ]]; then #VS Code version >= Engine version, can proceed." resultedVersion=$(echo "${vsixMetadata}" | jq -r ".version") break