Skip to content

cherry-pick baseURL fix to istio.io #16663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
Jul 14, 2025
Merged

cherry-pick baseURL fix to istio.io #16663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db90c50
cp 16568
craigbox Jul 14, 2025
ead390d
Change hash to fool tests
craigbox Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,19 @@ JUNIT_REPORT := $(shell which go-junit-report 2> /dev/null || echo "${ISTIO_BIN}
ISTIO_SERVE_DOMAIN ?= localhost
export ISTIO_SERVE_DOMAIN

# Determine the base URL for the Netlify-hosted site depending on the Hugo context.
# 'production' context: Use site URL (istio.io, preliminary.istio.io or istio-staging.netlify.app)
# 'deploy-preview' context: Use per-build URL (deploy-preview-16568--preliminary-istio.netlify.app)
# any other context: use relative URLs
ifeq ($(CONTEXT),production)
baseurl := "$(URL)"
NETLIFY_URL := $(URL)/latest
else ifeq ($(CONTEXT),deploy-preview)
NETLIFY_URL := $(DEPLOY_PRIME_URL)/latest
else
NETLIFY_URL := /latest
endif
export NETLIFY_URL


# Which branch of the Istio source code do we fetch stuff from
export SOURCE_BRANCH_NAME ?= release-1.26
Expand Down Expand Up @@ -153,7 +163,7 @@ netlify_install:

netlify: netlify_install
@scripts/gen_site.sh
@scripts/build_site.sh "/latest"
@scripts/build_site.sh "${NETLIFY_URL}"
@scripts/include_archive_site.sh

# ISTIO_API_GIT_SOURCE allows to override the default Istio API repository, https://github.com/istio/api@$(SOURCE_BRANCH_NAME)
Expand Down