Skip to content

Commit 5690ec7

Browse files
authored
Merge pull request #22111 from jketema/jketema/swift-more-autobuild
Swift: Turn off caching and integrated driver in autobuild
2 parents 14450f5 + 36af59a commit 5690ec7

10 files changed

Lines changed: 13 additions & 12 deletions

File tree

swift/ql/integration-tests/autobuilder/failure/diagnostics.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"markdownMessage": "`autobuild` failed to run the build command:\n\n```\n/usr/bin/xcodebuild build -project <test-root-directory>/hello-failure.xcodeproj -target hello-failure CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO\n```\n\nSet up a [manual build command][1] or [check the logs of the autobuild step][2].\n\n[1]: https://docs.github.com/en/enterprise-server/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language\n[2]: https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs",
2+
"markdownMessage": "`autobuild` failed to run the build command:\n\n```\n/usr/bin/xcodebuild build -project <test-root-directory>/hello-failure.xcodeproj -target hello-failure CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO COMPILATION_CACHE_ENABLE_CACHING=NO SWIFT_ENABLE_COMPILE_CACHE=NO SWIFT_USE_INTEGRATED_DRIVER=NO\n```\n\nSet up a [manual build command][1] or [check the logs of the autobuild step][2].\n\n[1]: https://docs.github.com/en/enterprise-server/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-the-codeql-workflow-for-compiled-languages#adding-build-steps-for-a-compiled-language\n[2]: https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs",
33
"severity": "error",
44
"source": {
55
"extractorName": "swift",

swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/Files.macos_26.expected

Lines changed: 0 additions & 3 deletions
This file was deleted.

swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44

55
@runs_on.macos
6-
@pytest.mark.ql_test("DB-CHECK", xfail=not runs_on.macos_26)
7-
@pytest.mark.ql_test("*", expected=f"{'.macos_26' if runs_on.macos_26 else ''}.expected")
6+
@pytest.mark.ql_test("DB-CHECK", xfail=True)
87
def test(codeql, swift):
98
codeql.database.create()

swift/ql/integration-tests/osx/hello-ios/test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
def test(codeql, swift, xcode_16):
88
codeql.database.create(
99
command="xcodebuild build "
10-
"CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO",
10+
"CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO "
11+
"SWIFT_USE_INTEGRATED_DRIVER=NO",
1112
)

swift/ql/integration-tests/osx/hello-xcode/test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ def test(codeql, swift, xcode_all):
99
command="xcodebuild build "
1010
"-project codeql-swift-autobuild-test.xcodeproj "
1111
"-target codeql-swift-autobuild-test "
12-
"CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO",
12+
"CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO "
13+
"SWIFT_USE_INTEGRATED_DRIVER=NO",
1314
)

swift/swift-autobuilder/BuildRunner.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ bool buildXcodeTarget(const XcodeTarget& target, bool dryRun) {
7979
argv.push_back(target.name);
8080
argv.push_back("CODE_SIGNING_REQUIRED=NO");
8181
argv.push_back("CODE_SIGNING_ALLOWED=NO");
82+
argv.push_back("COMPILATION_CACHE_ENABLE_CACHING=NO");
83+
argv.push_back("SWIFT_ENABLE_COMPILE_CACHE=NO");
84+
argv.push_back("SWIFT_USE_INTEGRATED_DRIVER=NO");
8285
return run_build_command(argv, dryRun);
8386
}
8487

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/usr/bin/xcodebuild build -project ./hello-autobuilder.xcodeproj -target hello-autobuilder CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
1+
/usr/bin/xcodebuild build -project ./hello-autobuilder.xcodeproj -target hello-autobuilder CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO COMPILATION_CACHE_ENABLE_CACHING=NO SWIFT_ENABLE_COMPILE_CACHE=NO SWIFT_USE_INTEGRATED_DRIVER=NO
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/usr/bin/xcodebuild build -project ./Foo.xcodeproj -target FooDemo CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
1+
/usr/bin/xcodebuild build -project ./Foo.xcodeproj -target FooDemo CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO COMPILATION_CACHE_ENABLE_CACHING=NO SWIFT_ENABLE_COMPILE_CACHE=NO SWIFT_USE_INTEGRATED_DRIVER=NO
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/usr/bin/xcodebuild build -project ./hello-tests.xcodeproj -target hello-tests CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
1+
/usr/bin/xcodebuild build -project ./hello-tests.xcodeproj -target hello-tests CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO COMPILATION_CACHE_ENABLE_CACHING=NO SWIFT_ENABLE_COMPILE_CACHE=NO SWIFT_USE_INTEGRATED_DRIVER=NO
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/usr/bin/xcodebuild build -workspace ./Hello.xcworkspace -scheme hello-workspace CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
1+
/usr/bin/xcodebuild build -workspace ./Hello.xcworkspace -scheme hello-workspace CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO COMPILATION_CACHE_ENABLE_CACHING=NO SWIFT_ENABLE_COMPILE_CACHE=NO SWIFT_USE_INTEGRATED_DRIVER=NO

0 commit comments

Comments
 (0)