Skip to content

Commit 6f0cf83

Browse files
remove derived data path
move ccache env declarations
1 parent 065982b commit 6f0cf83

File tree

5 files changed

+12
-24
lines changed

5 files changed

+12
-24
lines changed

action.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ inputs:
114114
developer-id-installer-certificate-password:
115115
description: The password for the `Developer ID Installer` certificate. Required if `developer-id-installer-certificate` is provided.
116116
required: false
117-
derived-data-path:
118-
description: The path to use for Xcode DerivedData. Defaults to a sibling 'DerivedData' directory next to the .xcodeproj.
119-
required: false
120117
outputs:
121118
executable:
122119
description: The path to the generated archive executable.

dist/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58293,7 +58293,7 @@ async function unlockTemporaryKeychain(keychainPath, tempCredential) {
5829358293
Object.defineProperty(exports, "__esModule", ({ value: true }));
5829458294
exports.XcodeProject = void 0;
5829558295
class XcodeProject {
58296-
constructor(projectPath, projectName, platform, destination, bundleId, projectDirectory, versionString, bundleVersion, scheme, credential, xcodeVersion, derivedDataPath) {
58296+
constructor(projectPath, projectName, platform, destination, bundleId, projectDirectory, versionString, bundleVersion, scheme, credential, xcodeVersion) {
5829758297
this.projectPath = projectPath;
5829858298
this.projectName = projectName;
5829958299
this.platform = platform;
@@ -58306,7 +58306,6 @@ class XcodeProject {
5830658306
this.credential = credential;
5830758307
this.xcodeVersion = xcodeVersion;
5830858308
this.isSteamBuild = false;
58309-
this.derivedDataPath = derivedDataPath;
5831058309
}
5831158310
isAppStoreUpload() {
5831258311
return this.exportOption === 'app-store' || this.exportOption === 'app-store-connect';
@@ -58528,7 +58527,7 @@ async function GetProjectDetails(credential, xcodeVersion) {
5852858527
core.info(`CFBundleVersion: ${cFBundleVersion}`);
5852958528
const derivedDataPathInput = core.getInput('derived-data-path') || path.join(projectDirectory, 'DerivedData');
5853058529
core.debug(`DerivedData path input: ${derivedDataPathInput}`);
58531-
const projectRef = new XcodeProject_1.XcodeProject(projectPath, projectName, platform, destination, bundleId, projectDirectory, cFBundleShortVersionString, cFBundleVersion, scheme, credential, xcodeVersion, derivedDataPathInput);
58530+
const projectRef = new XcodeProject_1.XcodeProject(projectPath, projectName, platform, destination, bundleId, projectDirectory, cFBundleShortVersionString, cFBundleVersion, scheme, credential, xcodeVersion);
5853258531
projectRef.autoIncrementBuildNumber = core.getInput('auto-increment-build-number') === 'true';
5853358532
await getExportOptions(projectRef);
5853458533
if (projectRef.isAppStoreUpload()) {
@@ -58783,7 +58782,6 @@ async function ArchiveXcodeProject(projectRef) {
5878358782
'-destination', projectRef.destination,
5878458783
'-configuration', configuration,
5878558784
'-archivePath', archivePath,
58786-
`-derivedDataPath`, projectRef.derivedDataPath,
5878758785
`-authenticationKeyID`, projectRef.credential.appStoreConnectKeyId,
5878858786
`-authenticationKeyPath`, projectRef.credential.appStoreConnectKeyPath,
5878958787
`-authenticationKeyIssuerID`, projectRef.credential.appStoreConnectIssuerId
@@ -58848,7 +58846,6 @@ async function ExportXcodeArchive(projectRef) {
5884858846
'-archivePath', archivePath,
5884958847
'-exportPath', projectRef.exportPath,
5885058848
'-exportOptionsPlist', exportOptionsPath,
58851-
`-derivedDataPath`, projectRef.derivedDataPath,
5885258849
`-authenticationKeyID`, projectRef.credential.appStoreConnectKeyId,
5885358850
`-authenticationKeyPath`, projectRef.credential.appStoreConnectKeyPath,
5885458851
`-authenticationKeyIssuerID`, projectRef.credential.appStoreConnectIssuerId
@@ -59346,6 +59343,10 @@ async function execXcodeBuild(xcodeBuildArgs) {
5934659343
output += data.toString();
5934759344
}
5934859345
},
59346+
env: {
59347+
CC: 'ccache clang',
59348+
CXX: 'ccache clang++'
59349+
},
5934959350
ignoreReturnCode: true
5935059351
});
5935159352
await parseBundleLog(output);
@@ -59377,10 +59378,6 @@ async function execWithXcBeautify(xcodeBuildArgs) {
5937759378
errorOutput += data.toString();
5937859379
}
5937959380
},
59380-
env: {
59381-
CC: 'ccache clang',
59382-
CXX: 'ccache clang++'
59383-
},
5938459381
silent: true,
5938559382
ignoreReturnCode: true
5938659383
});

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/XcodeProject.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export class XcodeProject {
1414
scheme: string,
1515
credential: AppleCredential,
1616
xcodeVersion: SemVer,
17-
derivedDataPath: string,
1817
) {
1918
this.projectPath = projectPath;
2019
this.projectName = projectName;
@@ -28,7 +27,6 @@ export class XcodeProject {
2827
this.credential = credential
2928
this.xcodeVersion = xcodeVersion;
3029
this.isSteamBuild = false;
31-
this.derivedDataPath = derivedDataPath;
3230
}
3331
projectPath: string;
3432
projectName: string;
@@ -52,7 +50,6 @@ export class XcodeProject {
5250
isSteamBuild: boolean;
5351
archiveType: string;
5452
notarize: boolean;
55-
derivedDataPath: string;
5653
isAppStoreUpload(): boolean {
5754
return this.exportOption === 'app-store' || this.exportOption === 'app-store-connect';
5855
}

src/xcode.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ export async function GetProjectDetails(credential: AppleCredential, xcodeVersio
120120
cFBundleVersion,
121121
scheme,
122122
credential,
123-
xcodeVersion,
124-
derivedDataPathInput
123+
xcodeVersion
125124
);
126125
projectRef.autoIncrementBuildNumber = core.getInput('auto-increment-build-number') === 'true';
127126
await getExportOptions(projectRef);
@@ -373,7 +372,6 @@ export async function ArchiveXcodeProject(projectRef: XcodeProject): Promise<Xco
373372
'-destination', projectRef.destination,
374373
'-configuration', configuration,
375374
'-archivePath', archivePath,
376-
`-derivedDataPath`, projectRef.derivedDataPath,
377375
`-authenticationKeyID`, projectRef.credential.appStoreConnectKeyId,
378376
`-authenticationKeyPath`, projectRef.credential.appStoreConnectKeyPath,
379377
`-authenticationKeyIssuerID`, projectRef.credential.appStoreConnectIssuerId
@@ -446,7 +444,6 @@ export async function ExportXcodeArchive(projectRef: XcodeProject): Promise<Xcod
446444
'-archivePath', archivePath,
447445
'-exportPath', projectRef.exportPath,
448446
'-exportOptionsPlist', exportOptionsPath,
449-
`-derivedDataPath`, projectRef.derivedDataPath,
450447
`-authenticationKeyID`, projectRef.credential.appStoreConnectKeyId,
451448
`-authenticationKeyPath`, projectRef.credential.appStoreConnectKeyPath,
452449
`-authenticationKeyIssuerID`, projectRef.credential.appStoreConnectIssuerId
@@ -935,6 +932,10 @@ async function execXcodeBuild(xcodeBuildArgs: string[]) {
935932
output += data.toString();
936933
}
937934
},
935+
env: {
936+
CC: 'ccache clang',
937+
CXX: 'ccache clang++'
938+
},
938939
ignoreReturnCode: true
939940
});
940941
await parseBundleLog(output);
@@ -966,10 +967,6 @@ async function execWithXcBeautify(xcodeBuildArgs: string[]) {
966967
errorOutput += data.toString();
967968
}
968969
},
969-
env: {
970-
CC: 'ccache clang',
971-
CXX: 'ccache clang++'
972-
},
973970
silent: true,
974971
ignoreReturnCode: true
975972
});

0 commit comments

Comments
 (0)