Ubuntu august 2024 (#158)

* update python release candidate * run all builds * exclude gcc12 from 20.04 * 20.04 rebuild * change qt mirror and correct gcc path * run all builds * fix bash conditional spacing
appveyor · Oct 2, 2024 · a1aea9e · a1aea9e
1 parent 3edeb0f
commit a1aea9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 38 deletions.
diff --git a/appveyor-build-linux-images.yml b/appveyor-build-linux-images.yml
@@ -1,44 +1,35 @@
 environment:
   matrix:
-    # - job_name: Ubuntu 22.04 on GCE us-central1
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2204-gce-us-central1
-    #   APPVEYOR_BAKE_IMAGE: ubuntu2204-master-gce-us-central1
-    #   BUILD_AGENT_MODE: GCE
+    - job_name: Ubuntu 22.04 on GCE us-central1
+      APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2204-gce-us-central1
+      APPVEYOR_BAKE_IMAGE: ubuntu2204-master-gce-us-central1
+      BUILD_AGENT_MODE: GCE
 
-    # - job_name: Ubuntu 20.04 on GCE us-central1
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2004-gce-us-central1
-    #   APPVEYOR_BAKE_IMAGE: ubuntu2004-master-gce-us-central1
-    #   BUILD_AGENT_MODE: GCE
+    - job_name: Ubuntu 20.04 on GCE us-central1
+      APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2004-gce-us-central1
+      APPVEYOR_BAKE_IMAGE: ubuntu2004-master-gce-us-central1
+      BUILD_AGENT_MODE: GCE
 
-    # - job_name: Ubuntu 18.04 on GCE us-central1
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1804-gce-us-central1
-    #   APPVEYOR_BAKE_IMAGE: ubuntu1804-master-gce-us-central1
-    #   BUILD_AGENT_MODE: GCE
-
-    # - job_name: Ubuntu 16.04 on GCE us-central1
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1604-gce-us-central1
-    #   APPVEYOR_BAKE_IMAGE: ubuntu1604-master-gce-us-central1
-    #   BUILD_AGENT_MODE: GCE
+    - job_name: Ubuntu 18.04 on GCE us-central1
+      APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1804-gce-us-central1
+      APPVEYOR_BAKE_IMAGE: ubuntu1804-master-gce-us-central1
+      BUILD_AGENT_MODE: GCE
 
     - job_name: Ubuntu 22.04 on Hyper-V
       APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2204-hyperv
       APPVEYOR_BAKE_IMAGE: ubuntu2204-master
       BUILD_AGENT_MODE: HyperV
 
-    # - job_name: Ubuntu 20.04 on Hyper-V
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2004-hyperv
-    #   APPVEYOR_BAKE_IMAGE: ubuntu2004-master
-    #   BUILD_AGENT_MODE: HyperV
+    - job_name: Ubuntu 20.04 on Hyper-V
+      APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-2004-hyperv
+      APPVEYOR_BAKE_IMAGE: ubuntu2004-master
+      BUILD_AGENT_MODE: HyperV
 
-    # - job_name: Ubuntu 18.04 on Hyper-V
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1804-hyperv
-    #   APPVEYOR_BAKE_IMAGE: ubuntu1804-master
-    #   BUILD_AGENT_MODE: HyperV
+    - job_name: Ubuntu 18.04 on Hyper-V
+      APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1804-hyperv
+      APPVEYOR_BAKE_IMAGE: ubuntu1804-master
+      BUILD_AGENT_MODE: HyperV
 
-    # - job_name: Ubuntu 16.04 on Hyper-V
-    #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1604-hyperv
-    #   APPVEYOR_BAKE_IMAGE: ubuntu1604-master
-    #   BUILD_AGENT_MODE: HyperV
 
     # - job_name: Ubuntu 18.04 on Azure West US
     #   APPVEYOR_BUILD_WORKER_IMAGE: base-ubuntu-1804-azure-westus

diff --git a/scripts/Ubuntu/common.sh b/scripts/Ubuntu/common.sh
@@ -350,9 +350,9 @@ function install_tools() {
     fi
 
     # python packages
-    if [[ $OS_ARCH == "amd64" ]] && [[$OS_CODENAME != "jammy"]]; then
+    if [[ $OS_ARCH == "amd64" ]] && [[ $OS_CODENAME != "jammy" ]]; then
         tools_array+=( "python" "python-dev" "python3-dev" "python-setuptools" )
-    elif [[$OS_ARCH == "amd64"]] && [[$OS_CODENAME == "jammy"]]; then
+    elif [[ $OS_ARCH == "amd64" ]] && [[ $OS_CODENAME == "jammy" ]]; then
         tools_array+=( "python2" "python2-dev" "python3-dev" "python-setuptools" )
     fi
     tools_array+=( "python3" "python3-setuptools" )
@@ -789,7 +789,7 @@ function install_pip3() {
 function install_pythons(){
     echo "[INFO] Running install_pythons..."
     if [[ $OS_ARCH == "amd64" ]]; then
-        declare PY_VERSIONS=( "2.7.18" "3.6.15" "3.7.16" "3.8.17" "3.9.18" "3.10.14" "3.11.9" "3.13.0b4" "3.12.6" )
+        declare PY_VERSIONS=( "2.7.18" "3.6.15" "3.7.16" "3.8.17" "3.9.18" "3.10.14" "3.11.9" "3.13.0rc1" "3.12.4" )
     else
         declare PY_VERSIONS=( "2.7.18" "3.7.16" "3.8.17" "3.9.17" "3.10.12" "3.11.4" "3.12.6" )
     fi

diff --git a/scripts/Ubuntu/focal.sh b/scripts/Ubuntu/focal.sh
@@ -168,7 +168,4 @@ function install_gcc() {
     apt-get -y -q install gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 40 --slave /usr/bin/g++ g++ /usr/bin/g++-11 ||
         { echo "[ERROR] Cannot install gcc-11." 1>&2; return 40; }
-    apt-get -y -q install gcc-12 g++-12 && \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 40 --slave /usr/bin/g++ g++ /usr/bin/g++-12 ||
-        { echo "[ERROR] Cannot install gcc-12." 1>&2; return 40; }
 }
diff --git a/scripts/Windows/install_qt_fast_linux.ps1 b/scripts/Windows/install_qt_fast_linux.ps1
@@ -8,7 +8,7 @@ $component_groups = @(
     @{
         version    = "6.7.2"
         components = @(
-            "gcc_64",
+            "linux_gcc_64",
             "debug_info",
             "debug_info.gcc_64",
             "addons.qt3d",

diff --git a/scripts/Windows/install_qt_module.ps1 b/scripts/Windows/install_qt_module.ps1
@@ -6,8 +6,8 @@ $QT_INSTALL_DIR = "C:\Qt"
 $QT_ROOT_URL = 'http://qt.mirror.constant.com/online/qtsdkrepository/windows_x86/desktop'
 
 if ($isLinux) {
-    $QT_ROOT_URL = 'https://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/linux_x64/desktop/'
-    #$QT_ROOT_URL = 'http://qt.mirror.constant.com/online/qtsdkrepository/linux_x64/desktop'
+    #$QT_ROOT_URL = 'https://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/linux_x64/desktop/'
+    $QT_ROOT_URL = 'http://qt.mirror.constant.com/online/qtsdkrepository/linux_x64/desktop'
     #$QT_ROOT_URL = 'https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/'
 } elseif ($isMacOS) {
     $QT_ROOT_URL = 'http://qt.mirror.constant.com/online/qtsdkrepository/mac_x64/desktop'