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 <[email protected]> * fix OS ci build Signed-off-by: Valeriy Svydenko <[email protected]> --------- Signed-off-by: Valeriy Svydenko <[email protected]>
eclipse-che · Jul 25, 2024 · 6e68583 · 6e68583
1 parent 50cba26
commit 6e68583
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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