Skip to content

Fix an issue in the CI where the Mac runner builds the entire app twi… #516

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.

Sign up for GitHub

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

Open
assertivist wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix an issue in the CI where the Mac runner builds the entire app twi… #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74cfbcc
Fix an issue in the CI where the Mac runner builds the entire app twi…
assertivist Dec 4, 2025
0ab6539
Standardize build settings between Avara and AvaraTests, update to ma…
dcwatson Dec 4, 2025
dc3aec8
Merge branch 'main' into fix-mac-ci-duplicate-builds
dcwatson Dec 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/avara-beta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
max_releases: 1
macOS:
name: MacOS
runs-on: macos-13
runs-on: macos-15
steps:
- name: install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/avara-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
max_releases: 1
macOS:
name: macOS
runs-on: macos-13
runs-on: macos-15
steps:
- name: install dependencies
run: |
Expand All @@ -70,9 +70,9 @@ jobs:
brew install googletest
- uses: actions/checkout@v4
- name: Run headless tests
run: make tests
run: make -j4 mactests
- name: make macdist
run: make -j4 clean macdist
run: make -j4 macdist
- name: deploy main nightly
if: startsWith(github.repository_owner, 'avaraline') && endsWith(github.ref, 'main')
uses: WebFreak001/[email protected]
Expand Down
66 changes: 59 additions & 7 deletions Avara.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2215,9 +2215,10 @@
isa = PBXNativeTarget;
buildConfigurationList = E517F052299713990036B206 /* Build configuration list for PBXNativeTarget "AvaraTests" */;
buildPhases = (
E2DCC6552BDE0D1B00D70C49 /* Embed Frameworks */,
E573B9452EE1CC9B0086D426 /* Update GitVersion.h */,
E517F048299713990036B206 /* Sources */,
E517F049299713990036B206 /* Frameworks */,
E2DCC6552BDE0D1B00D70C49 /* Embed Frameworks */,
E517F04A299713990036B206 /* CopyFiles */,
);
buildRules = (
Expand Down Expand Up @@ -2353,6 +2354,25 @@
shellPath = /bin/sh;
shellScript = "RESOURCEDIR=\"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"\nrm \"$RESOURCEDIR\"/levels/*.r\nrm \"$RESOURCEDIR\"/rsrc/Avara.r\n";
};
E573B9452EE1CC9B0086D426 /* Update GitVersion.h */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Update GitVersion.h";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "GIT_HASH=`/usr/bin/git describe --always --dirty` \ngrep -q $GIT_HASH src/util/GitVersion.h || (echo \"#define GIT_VERSION \\\"$GIT_HASH\\\"\" > src/util/GitVersion.h)\n";
};
E5C57BC3298997B6008740F4 /* Update GitVersion.h */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -2910,12 +2930,19 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CODE_SIGN_STYLE = Manual;
EXCLUDED_ARCHS = x86_64;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
/Library/Frameworks,
);
HEADER_SEARCH_PATHS = (
"vendor/**",
/opt/homebrew/include,
/usr/local/include,
);
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/homebrew/lib,
Expand All @@ -2937,12 +2964,19 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CODE_SIGN_STYLE = Manual;
EXCLUDED_ARCHS = x86_64;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
/Library/Frameworks,
);
HEADER_SEARCH_PATHS = (
"vendor/**",
/opt/homebrew/include,
/usr/local/include,
);
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/homebrew/lib,
Expand Down Expand Up @@ -3082,7 +3116,11 @@
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "vendor/**";
HEADER_SEARCH_PATHS = (
"vendor/**",
/opt/homebrew/include,
/usr/local/include,
);
INFOPLIST_FILE = platform/macos/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.action-games";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
Expand All @@ -3092,7 +3130,12 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/homebrew/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -3124,7 +3167,11 @@
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
GENERATE_INFOPLIST_FILE = YES;
HEADER_SEARCH_PATHS = "vendor/**";
HEADER_SEARCH_PATHS = (
"vendor/**",
/opt/homebrew/include,
/usr/local/include,
);
INFOPLIST_FILE = platform/macos/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.action-games";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
Expand All @@ -3134,7 +3181,12 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/homebrew/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ macapp:
ONLY_ACTIVE_ARCH=NO \
CONFIGURATION_BUILD_DIR=$(BUILD_DIR)

mactests:
xcodebuild -configuration Debug -scheme AvaraTests \
-IDEBuildOperationMaxNumberOfConcurrentCompileTasks=$(JOBS) \
-derivedDataPath $(BUILD_DIR)/DerivedData \
CONFIGURATION_BUILD_DIR=$(BUILD_DIR)
$(BUILD_DIR)/AvaraTests

macdist: macapp
cd $(BUILD_DIR) && zip $(ZIPFLAGS) MacAvara.zip Avara.app && cd ..

Expand Down
Loading