Skip to content
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.

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

[pull] master from cypress-io:master #128

Merged
merged 2 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions factory/.env
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}"

# Update the FACTORY_VERSION to deploy cypress/factory if you make changes to
# BASE_IMAGE, FACTORY_DEFAULT_NODE_VERSION, YARN_VERSION, factory.Dockerfile or installScripts
FACTORY_VERSION='5.2.1'
FACTORY_VERSION='5.3.0'

# Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
CHROME_VERSION='132.0.6834.159-1'
CHROME_VERSION='133.0.6943.53-1'

# Cypress versions: https://www.npmjs.com/package/cypress
CYPRESS_VERSION='14.0.1'
CYPRESS_VERSION='14.0.2'

# Edge versions: https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/
EDGE_VERSION='132.0.2957.127-1'
EDGE_VERSION='132.0.2957.140-1'

# Firefox versions: https://download-installer.cdn.mozilla.net/pub/firefox/releases/
FIREFOX_VERSION='134.0.2'
FIREFOX_VERSION='135.0'

# Yarn versions: https://www.npmjs.com/package/yarn and
# https://classic.yarnpkg.com/latest-version
Expand Down
4 changes: 4 additions & 0 deletions factory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change log

## 5.3.0

- Additionally support Firefox 135.0 and above with download file extension `xz` instead of `bz2`. (See [Firefox 135.0 release notes](https://www.mozilla.org/en-US/firefox/135.0/releasenotes/) and [Announcing Faster, Lighter Firefox Downloads for Linux with .tar.xz Packaging!](https://blog.nightly.mozilla.org/2024/11/28/announcing-faster-lighter-firefox-downloads-for-linux-with-tar-xz-packaging/)). Addresses [#1294](https://github.com/cypress-io/cypress-docker-images/issues/1294).

## 5.2.1

- Updated default node version from `22.13.0` to `22.13.1`. Addressed in [#1288](https://github.com/cypress-io/cypress-docker-images/pull/1288).
Expand Down
7 changes: 4 additions & 3 deletions factory/installScripts/firefox/default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ apt-get update \
libgtk-3-0 \
libdbus-glib-1-2 \
mplayer \
&& wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/${1}/linux-x86_64/en-US/firefox-${1}.tar.bz2 \
&& tar -C /opt -xjf /tmp/firefox.tar.bz2 \
&& rm /tmp/firefox.tar.bz2 \
xz-utils \
&& wget --no-verbose -O /tmp/firefox.tar.${2} https://download-installer.cdn.mozilla.net/pub/firefox/releases/${1}/linux-x86_64/en-US/firefox-${1}.tar.${2} \
&& tar -C /opt -xaf /tmp/firefox.tar.${2} \
&& rm /tmp/firefox.tar.${2} \
&& ln -fs /opt/firefox/firefox /usr/bin/firefox \
11 changes: 10 additions & 1 deletion factory/installScripts/firefox/install-firefox-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@ if (process.arch !== 'x64') {
return
}

// Change in compression from bz2 to xz in Firefox 135.0
// See https://www.mozilla.org/en-US/firefox/135.0/releasenotes/

let compression = `bz2`

if (firefoxVersion >= '135.0') {
compression = `xz`
}

console.log('Installing Firefox version: ', firefoxVersion)

// Insert logic here if needed to run a different install script based on chrome version.
const install = spawn(`${__dirname}/default.sh`, [firefoxVersion], {stdio: 'inherit'})
const install = spawn(`${__dirname}/default.sh`, [firefoxVersion, compression], {stdio: 'inherit'})

install.on('error', function (error) {
console.log('child process errored with ' + error.toString())
Expand Down
Loading