Skip to content

Commit f2db65b

Browse files
committed
Fix Istio latest test
1 parent 21308c3 commit f2db65b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/istio-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019, 2024, Oracle Corporation and/or its affiliates. All rights reserved.
1+
# Copyright 2019, 2025, Oracle Corporation and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at
33
# http://oss.oracle.com/licenses/upl.
44

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,17 @@ ifeq (,$(ISTIO_VERSION))
365365
ISTIO_VERSION_USE := $(shell $(SCRIPTS_DIR)/find-istio-version.sh "$(TOOLS_DIRECTORY)/istio-latest.txt")
366366
ISTIO_REVISION := $(subst .,-,$(ISTIO_VERSION_USE))
367367
ISTIO_HOME := $(TOOLS_DIRECTORY)/istio-$(ISTIO_VERSION_USE)
368+
else
369+
ifeq (latest,$(ISTIO_VERSION))
370+
ISTIO_VERSION_USE := $(shell $(SCRIPTS_DIR)/find-istio-version.sh "$(TOOLS_DIRECTORY)/istio-latest.txt")
371+
ISTIO_REVISION := $(subst .,-,$(ISTIO_VERSION_USE))
372+
ISTIO_HOME := $(TOOLS_DIRECTORY)/istio-$(ISTIO_VERSION_USE)
368373
else
369374
ISTIO_VERSION_USE := $(ISTIO_VERSION)
370375
ISTIO_REVISION := $(subst .,-,$(ISTIO_VERSION))
371376
ISTIO_HOME := $(TOOLS_DIRECTORY)/istio-$(ISTIO_VERSION)
372377
endif
378+
endif
373379

374380
# ----------------------------------------------------------------------------------------------------------------------
375381
# Tanzu settings

examples/400_Istio/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2021, 2024, Oracle and/or its affiliates.
3+
Copyright (c) 2021, 2025, Oracle and/or its affiliates.
44
Licensed under the Universal Permissive License v 1.0 as shown at
55
http://oss.oracle.com/licenses/upl.
66

0 commit comments

Comments
 (0)