Skip to content

Fix SwiftPM package resolution in GitHub Actions build job #9

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

Merged
hugeBlack merged 3 commits into from
Sep 5, 2026
Merged

Fix SwiftPM package resolution in GitHub Actions build job #9

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
1614498
Initial plan
Copilot Sep 5, 2026
ffa9e2a
fix: pass Git bare-repo override to SwiftPM builds
Copilot Sep 5, 2026
e936254
chore: remove generated python cache artifact
Copilot Sep 5, 2026
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,7 @@ tmp
*.mp3

scratch*.sh
*.sh
*.sh
# Python
__pycache__/
*.pyc
26 changes: 18 additions & 8 deletions scripts/ci/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
ROOT = Path(__file__).resolve().parents[2]
SCRIPTS = ROOT / 'scripts/ci'
BUILD_SETTINGS_OUTFILE = "project-build-settings.txt"
SWIFTPM_GIT_CONFIG_ENV = (
"GIT_CONFIG_COUNT=1 "
"GIT_CONFIG_KEY_0=safe.bareRepository "
"GIT_CONFIG_VALUE_0=all"
)

# ----------------------------------------------------------
# helpers
Expand Down Expand Up @@ -51,6 +56,9 @@ def runAndGet(cmd, cwd=None):
def getenv(name, default=""):
return os.environ.get(name, default)

def with_swiftpm_git_config(cmd):
return f"{SWIFTPM_GIT_CONFIG_ENV} {cmd}"

# ----------------------------------------------------------
# SHARED
# ----------------------------------------------------------
Expand Down Expand Up @@ -78,7 +86,7 @@ def count_new_commits(last_commit):
# ----------------------------------------------------------
def dump_project_settings(outdir=None):
outfile = Path(outdir).resolve() / BUILD_SETTINGS_OUTFILE if outdir else BUILD_SETTINGS_OUTFILE
run(f"xcodebuild -showBuildSettings 2>&1 > '{outfile}'")
run(with_swiftpm_git_config(f"xcodebuild -showBuildSettings 2>&1 > '{outfile}'"))

def _extract_setting(cmd):
out = runAndGet(cmd + " || true").strip() # prevent grep failure from aborting
Expand All @@ -94,10 +102,12 @@ def _read_dumped_build_setting(name):

def query_build_setting(name):
return _extract_setting(
f"xcodebuild -showBuildSettings 2>&1 "
f"| grep '{name} = ' "
"| tail -1 "
"| sed -e 's/.*= //g'"
with_swiftpm_git_config(
f"xcodebuild -showBuildSettings 2>&1 "
f"| grep '{name} = ' "
"| tail -1 "
"| sed -e 's/.*= //g'"
)
)

def get_product_name(): return query_build_setting("PRODUCT_NAME")
Expand Down Expand Up @@ -143,7 +153,7 @@ def build():
run("mkdir -p build/logs")
run(
"set -o pipefail && "
"NSUnbufferedIO=YES make -B build "
f"{SWIFTPM_GIT_CONFIG_ENV} NSUnbufferedIO=YES make -B build "
"2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions"
)
run("make fakesign | tee -a build/logs/build.log")
Expand All @@ -157,7 +167,7 @@ def build():
def tests_build():
run("mkdir -p build/logs")
run(
"NSUnbufferedIO=YES make -B build-tests "
f"{SWIFTPM_GIT_CONFIG_ENV} NSUnbufferedIO=YES make -B build-tests "
"2>&1 | tee -a build/logs/tests-build.log | xcbeautify --renderer github-actions"
)

Expand Down Expand Up @@ -207,7 +217,7 @@ def tests_run(model):
if not is_sim_booted(model):
boot_sim_sync(model)

run("make run-tests 2>&1 | tee -a build/logs/tests-run.log")
run(f"{SWIFTPM_GIT_CONFIG_ENV} make run-tests 2>&1 | tee -a build/logs/tests-run.log")
run("zip -r -9 ./test-results.zip ./build/tests")

# ----------------------------------------------------------
Expand Down