[PR #1385] [CLOSED] Refactoring of CI Mac build configurations and build scripts #1802

New issue

Closed

opened 2026-05-05 08:02:13 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 08:02:13 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/debauchee/barrier/pull/1385
Author: @shymega
Created: 11/4/2021
Status: ❌ Closed

Base: master ← Head: enhancement/builds/macos-universal

📝 Commits (10+)

f5c759a Refactoring of CI configurations and build scripts
464949b Adjust CMakeLists to compile for M1 and x86
55dac23 Remove CMAKE_OSX_ARCHITECTURES env variable, wrong place
f1c5405 Modify CI configuration - Mac matrix dual builds
2e0f548 Simplify CI jobs, and merge DMG generation into one job
5d50eec Disable arm64 & x86_64 Mac builds - Qt causes build failures
61898a6 Renamed Mac env script as per @p12tic's feedback
4308e91 Remove redundant comments and output as per @p12tic's feedback
cb754b6 Simplify B_CMAKE_FLAGS, and declare before further configuration
16b2f93 Remove check for macos_environment.sh - no need for it

📊 Changes

4 files changed (+39 additions, -23 deletions)

View changed files

📝 azure-pipelines.yml (+4 -4)
📝 clean_build.sh (+34 -19)
➕ doc/newsfragments/enhance-ci-builds-and-add-macos-universal-binaries-builds.feature (+1 -0)
📝 macos_environment.sh (+0 -0)

📄 Description

Now, CI builds for macOS involve three separate builds for a range of macOS versions, and a final Universal macOS Binary made on Big Sur. It should work with the M1 chip and x86_64 Intel Macs.

I have also renamed osx_environment->macOS_environment.sh to reflect the new name change of Apple's desktop OS.

In terms of the clean_builds.sh script, this has also been refactored to be more resilient, and efficient (marginally).

Signed-off-by: Dom Rodriguez shymega@shymega.org.uk

Contributor Checklist:

I have created a file in the doc/newsfragments directory (and read the README.md in that directory)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/debauchee/barrier/pull/1385 **Author:** [@shymega](https://github.com/shymega) **Created:** 11/4/2021 **Status:** ❌ Closed **Base:** `master` ← **Head:** `enhancement/builds/macos-universal` --- ### 📝 Commits (10+) - [`f5c759a`](https://github.com/debauchee/barrier/commit/f5c759a9100e8597a8676efec3f8fc40a80942c8) Refactoring of CI configurations and build scripts - [`464949b`](https://github.com/debauchee/barrier/commit/464949b4028a977c101e1654caeaa25295c606c5) Adjust CMakeLists to compile for M1 and x86 - [`55dac23`](https://github.com/debauchee/barrier/commit/55dac2333d97631c2e9fa814e27aad2176b99e21) Remove CMAKE_OSX_ARCHITECTURES env variable, wrong place - [`f1c5405`](https://github.com/debauchee/barrier/commit/f1c5405873393856c841f0029e6dcbd9634ed6f0) Modify CI configuration - Mac matrix dual builds - [`2e0f548`](https://github.com/debauchee/barrier/commit/2e0f54822eee6fcc36f2a021b16f0872efa7620c) Simplify CI jobs, and merge DMG generation into one job - [`5d50eec`](https://github.com/debauchee/barrier/commit/5d50eec10de746f678e91382b4fd21619208b0e3) Disable arm64 & x86_64 Mac builds - Qt causes build failures - [`61898a6`](https://github.com/debauchee/barrier/commit/61898a6509d90c1fd79ee3a7bd4bfb0fe4bd801a) Renamed Mac env script as per @p12tic's feedback - [`4308e91`](https://github.com/debauchee/barrier/commit/4308e91214539f476f80bf87e9c8798475d1360a) Remove redundant comments and output as per @p12tic's feedback - [`cb754b6`](https://github.com/debauchee/barrier/commit/cb754b6799a2ba200f404c9c5ff803f6993b8ada) Simplify B_CMAKE_FLAGS, and declare before further configuration - [`16b2f93`](https://github.com/debauchee/barrier/commit/16b2f93bf5e929f38c515b068fb3edf6debf2111) Remove check for macos_environment.sh - no need for it ### 📊 Changes **4 files changed** (+39 additions, -23 deletions) <details> <summary>View changed files</summary> 📝 `azure-pipelines.yml` (+4 -4) 📝 `clean_build.sh` (+34 -19) ➕ `doc/newsfragments/enhance-ci-builds-and-add-macos-universal-binaries-builds.feature` (+1 -0) 📝 `macos_environment.sh` (+0 -0) </details> ### 📄 Description Now, CI builds for macOS involve three separate builds for a range of macOS versions, and a final Universal macOS Binary made on Big Sur. It should work with the M1 chip and x86_64 Intel Macs. I have also renamed osx_environment->macOS_environment.sh to reflect the new name change of Apple's desktop OS. In terms of the clean_builds.sh script, this has also been refactored to be more resilient, and efficient (marginally). Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk> ## Contributor Checklist: * [x] I have created a file in the `doc/newsfragments` directory (and read the `README.md` in that directory) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>