diff --git a/Makefile b/Makefile index 4a51bf0a64..1f6dde524f 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ NAME := $(or $(NAME),$(NAME),selenium) CURRENT_DATE := $(shell date '+%Y%m%d') BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE)) -BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.29.0) -BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.29.0) -BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.29.0) +BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.30.0) +BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.30.0) +BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.30.0) BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly) -BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.30.0-SNAPSHOT) -VERSION := $(or $(VERSION),$(VERSION),4.29.0) -MVN_SELENIUM_VERSION := $(or $(MVN_SELENIUM_VERSION),$(MVN_SELENIUM_VERSION),4.29.0) +BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.31.0-SNAPSHOT) +VERSION := $(or $(VERSION),$(VERSION),4.30.0) +MVN_SELENIUM_VERSION := $(or $(MVN_SELENIUM_VERSION),$(MVN_SELENIUM_VERSION),4.30.0) TAG_VERSION := $(VERSION)-$(BUILD_DATE) CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly) NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME)) @@ -19,9 +19,9 @@ BUILD_ARGS := $(BUILD_ARGS) --progress plain MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION))) MINOR := $(word 2,$(subst ., ,$(TAG_VERSION))) MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION))) -FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1) +FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1.1) FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1) -FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1) +FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1.1) FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),selenium) FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),latest) CURRENT_PLATFORM := $(shell if [ `arch` = "aarch64" ] || [ `arch` = "arm64" ]; then echo "linux/arm64"; else echo "linux/amd64"; fi) diff --git a/tests/build-backward-compatible/browser-matrix.yml b/tests/build-backward-compatible/browser-matrix.yml index c8f1a0a7f7..5684c1bbcc 100644 --- a/tests/build-backward-compatible/browser-matrix.yml +++ b/tests/build-backward-compatible/browser-matrix.yml @@ -12,8 +12,8 @@ matrix: FIREFOX_DOWNLOAD_URL: https://download-installer.cdn.mozilla.net/pub/firefox/nightly/2025/01/2025-01-06-09-47-46-mozilla-central/firefox-135.0a1.en-US.linux-aarch64.deb FIREFOX_PLATFORMS: linux/amd64,linux/arm64 '134': - EDGE_VERSION: null - CHROME_VERSION: google-chrome-stable=134.0.6998.35-1 + EDGE_VERSION: microsoft-edge-stable=134.0.3124.83-1 + CHROME_VERSION: google-chrome-stable=134.0.6998.165-1 FIREFOX_VERSION: 134.0.2 FIREFOX_DOWNLOAD_URL: https://download-installer.cdn.mozilla.net/pub/firefox/nightly/2024/11/2024-11-25-09-40-45-mozilla-central/firefox-134.0a1.en-US.linux-aarch64.deb FIREFOX_PLATFORMS: linux/amd64,linux/arm64 diff --git a/tests/build-backward-compatible/selenium-matrix.yml b/tests/build-backward-compatible/selenium-matrix.yml index a722f8917c..38572a1fdf 100644 --- a/tests/build-backward-compatible/selenium-matrix.yml +++ b/tests/build-backward-compatible/selenium-matrix.yml @@ -11,6 +11,12 @@ matrix: - 124 - 123 - 122 + 4.30.0: + BASE_RELEASE: selenium-4.30.0 + BASE_VERSION: 4.30.0 + VERSION: 4.30.0 + BINDING_VERSION: 4.30.0 + browser: 4.29.0: BASE_RELEASE: selenium-4.29.0 BASE_VERSION: 4.29.0