Compare commits

...

6 Commits
v6.7.3 ... 6.7

Author SHA1 Message Date
Simo Fält
050897a64b Provisioning: Use bullseye-backports repo from archive
Bullseye-backports has reached end-of-life and is no longer
supported or updated.

Change-Id: If154155507e159333c0d0b638fc6910b1814665a
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
(cherry picked from commit 8882c8cac4)
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2025-08-04 06:53:11 +00:00
Matti Paaso
8e921c3ad6 Update Java in Linux targets
Jenkins needs Java 17

Task-number: QTQAINFRA-6263
Change-Id: Ia6438ecadbf98dc2c27e4efc863133ab5bbb668c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Juho Lääkkö <juho.laakko@qt.io>
2024-11-20 13:17:05 +02:00
Matti Paaso
409ffc507b Remove wasm test targets from qtbase
Still needs Java 17 update provisioning change for Jenkins. After
provisioning wasm tests are failing and commits will never end
into baseline.

Task-number: QTQAINFRA-6263
Change-Id: Ie450af80a66ab6623d6daff1c63761c301151808
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-11-20 13:16:53 +02:00
Fredrik Ålund
1499e6ebdf Only install necessary Mimer SQL components
When installing Mimer SQL only install the parts that we need for the
build. Avoid the Mimer SQL Server, DbVisuzlier, Java, documentation,
and replication support.

Pick-to: 6.8
Change-Id: I4cc3fb6f77469a2a566d35483034fe1eea9d6ffd
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 37be28e63e)
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Fredrik Ålund <fredrik.alund@mimer.com>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2024-11-19 10:57:38 +00:00
Matti Paaso
b5637bcffc Update Java version into 17
Jenkins needs version 17 to get agent running in VM

Task-number: QTQAINFRA-6263
Change-Id: I57daadad6baa2e7e538874769af3fbe0cdd42878
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 5128df0130)
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-11-19 10:57:33 +00:00
Matti Paaso
d2e90f7b0e Update java in macOS x64
Android requires java 17 in Qt 6.8 and RTA needs java 17 into VMs
to compile Qt examples.

Task-number: QTQAINFRA-6492
Pick-to: 6.8
Change-Id: I873c188154c2eae2a9eebddb94279c41ca822576
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 73cc61c389)
Reviewed-by: Juho Lääkkö <juho.laakko@qt.io>
2024-11-19 10:57:30 +00:00
10 changed files with 32 additions and 20 deletions

View File

@@ -5,7 +5,6 @@ Include: [
integrity.yaml,
ios-tests.yaml,
address_sanitizer_platforms.yaml,
linux_android_tests_multi_abi.yaml,
wasm_qtbase_tests.yaml
linux_android_tests_multi_abi.yaml
]
Configurations: []

View File

@@ -1,17 +1,20 @@
#!/usr/bin/env bash
# Copyright (C) 2021 The Qt Company Ltd.
# Copyright (C) 2024 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script installs JDK
set -ex
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
echo "Installing Java Development Kit"
version=11.0.12
targetFile=jdk-${version}_osx-x64_bin.dmg
version=17.0.12
targetFile=jdk-${version}_macos-x64_bin.dmg
expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb"
url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac
echo "Mounting $targetFile"
sudo mkdir -p /Volumes/files
@@ -19,6 +22,8 @@ sudo mount -o locallocks "$url" /Volumes/files
sudo cp "/Volumes/files/$targetFile" /tmp
sudo umount /Volumes/files
cd /tmp
VerifyHash "$targetFile" "$expectedHash"
sudo hdiutil attach "/tmp/$targetFile"
echo Installing JDK

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright (C) 2021 The Qt Company Ltd.
# Copyright (C) 2024 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script installs JDK
@@ -8,10 +8,10 @@ set -ex
echo "Installing Java Development Kit"
targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
echo "Mounting $targetFile"
sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
sudo hdiutil attach "/tmp/$targetFile"
echo Installing JDK
cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target /
cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
echo "Unmounting $targetFile"
sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force
sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
echo "Disable auto update"
sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
echo "JDK Version = 15.0.2" >> ~/versions.txt
echo "JDK Version = 17.0.13" >> ~/versions.txt

View File

@@ -16,7 +16,7 @@ $mimer_dir="c:\MimerSQL"
Download $url_official $url_cache $mimersqlPackage
Verify-Checksum $mimersqlPackage $sha1
Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive"
Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive ExcludeDbVisualizer=1 ExcludeJava=1 ExcludeServer=1 ExcludeDocumentation=1 ExcludeReplication=1"
Set-EnvironmentVariable "MIMERSQL_DEV_ROOT" "$mimer_dir\dev"

View File

@@ -21,9 +21,9 @@ done
echo "Using public repositories for now. Repo-clones isn't set yet for Debian use"
# (ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
echo "deb http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
echo "deb-src http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
echo "deb https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
echo "deb-src https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
# Make sure needed ca-certificates are available
installPackages+=(ca-certificates)
# Git is not needed by builds themselves, but is nice to have
@@ -111,7 +111,7 @@ installPackages+=(libcurl4-openssl-dev)
installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-11-jdk)
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

View File

@@ -137,8 +137,8 @@ installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-8-jdk)
#Java 11 for Android
installPackages+=(openjdk-11-jdk)
#Java 17 for Android
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

View File

@@ -139,8 +139,8 @@ installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-8-jdk)
#Java 11 for Android
installPackages+=(openjdk-11-jdk)
#Java 17 for Android, needed by RTA
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

View File

@@ -66,6 +66,9 @@ sudo zypper -nq install make
# Tools to build Git
sudo zypper -nq install autoconf libcurl-devel libexpat-devel
# Java
sudo zypper -nq install java-17-openjdk
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -72,6 +72,9 @@ sudo zypper -nq install openssl-3
# Valgrind (Needed for testlib selftests)
sudo zypper -nq install valgrind-devel
# Java
sudo zypper -nq install java-17-openjdk
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -72,6 +72,8 @@ sudo zypper -nq install valgrind-devel
# cifs-utils, for mounting smb drive
sudo zypper -nq install cifs-utils
# Java
sudo zypper -nq install java-17-openjdk
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt