CI: Update Windows & macOS build envs

WOLFI3654 · Jan 1, 2024 · f4eb9f8 · f4eb9f8
1 parent f07bdb8
commit f4eb9f8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,8 +22,8 @@ environment:
     MUMBLE_USE_ELEVATION: 'ON'
 
   matrix:
-    - MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
-      MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2023-10-06~0310159.x64'
+    - MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
 
 install:
   - ps: .ci/install-environment_windows.ps1

diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash
@@ -36,7 +36,8 @@ BUILD_NUMBER=$("./scripts/mumble-build-number.py" --commit "${BUILD_SOURCEVERSIO
 
 cd $BUILD_BINARIESDIRECTORY
 
-cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \
+cmake -G Ninja -DVCPKG_TARGET_TRIPLET=$MUMBLE_ENVIRONMENT_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN \
+      -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/$MUMBLE_ENVIRONMENT_TRIPLET" \
       -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DBUILD_NUMBER=$BUILD_NUMBER \
       -Dtests=ON -Dstatic=ON -Dsymbols=ON \
       -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY

diff --git a/.ci/azure-pipelines/install-environment_macos.bash b/.ci/azure-pipelines/install-environment_macos.bash
@@ -46,6 +46,6 @@ mkdir -p $MUMBLE_ENVIRONMENT_STORE
 
 "$currentDir"/.ci/azure-pipelines/extractWithProgress.bash "$environmentArchive" $MUMBLE_ENVIRONMENT_STORE
 
-chmod +x "$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx/tools/Ice/slice2cpp"
+chmod +x "$MUMBLE_ENVIRONMENT_PATH/installed/$MUMBLE_ENVIRONMENT_TRIPLET/tools/Ice/slice2cpp"
 
 ls -l $MUMBLE_ENVIRONMENT_STORE
diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml
@@ -24,8 +24,8 @@ jobs:
     pool:
       vmImage: 'windows-2022'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2023-10-06~0310159.x64'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
     steps:
     - template: steps_windows.yml
       parameters:
@@ -45,7 +45,8 @@ jobs:
     pool:
       vmImage: 'macOS-11'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'macos-static-1.5.x~2022-05-17~cd7e2c9.x64'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
     steps:
     - template: steps_macos.yml
       parameters:

diff --git a/.ci/azure-pipelines/main.yml b/.ci/azure-pipelines/main.yml
@@ -22,8 +22,8 @@ jobs:
     pool:
       vmImage: 'windows-2022'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'windows-static-1.5.x~2023-10-06~0310159.x64'
-      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
     steps:
     - template: steps_windows.yml
       parameters:
@@ -43,7 +43,8 @@ jobs:
     pool:
       vmImage: 'macOS-11'
     variables:
-      MUMBLE_ENVIRONMENT_VERSION: 'macos-static-1.5.x~2022-05-17~cd7e2c9.x64'
+      MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
     steps:
     - template: steps_macos.yml
       parameters: