Skip to content

Commit 0c2f7d7

Browse files
revert ccache stuff
1 parent 7b228ac commit 0c2f7d7

5 files changed

Lines changed: 4 additions & 35 deletions

File tree

dist/index.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59402,27 +59402,13 @@ async function execXcodeBuild(xcodeBuildArgs) {
5940259402
output += data.toString();
5940359403
}
5940459404
},
59405-
env: {
59406-
...process.env,
59407-
CC: 'ccache clang',
59408-
CXX: 'ccache clang++',
59409-
PATH: `${process.env.CCACHE_BIN}:${process.env.PATH}`,
59410-
CCACHE_LOGFILE: path.join(process.cwd(), 'ccache.log')
59411-
},
59405+
env: { ...process.env },
5941259406
ignoreReturnCode: true
5941359407
});
5941459408
await parseBundleLog(output);
5941559409
if (exitCode !== 0) {
5941659410
throw new Error(`xcodebuild exited with code: ${exitCode}`);
5941759411
}
59418-
core.startGroup('CCache');
59419-
try {
59420-
await (0, exec_1.exec)('ccache', ['-s']);
59421-
await (0, exec_1.exec)('cat', [path.join(process.cwd(), 'ccache.log')]);
59422-
}
59423-
finally {
59424-
core.endGroup();
59425-
}
5942659412
}
5942759413
async function execWithXcBeautify(xcodeBuildArgs) {
5942859414
try {
@@ -61592,7 +61578,6 @@ const exec = __nccwpck_require__(1514);
6159261578
const xcode_1 = __nccwpck_require__(9157);
6159361579
const AppleCredential_1 = __nccwpck_require__(4199);
6159461580
const semver = __nccwpck_require__(1383);
61595-
const utilities_1 = __nccwpck_require__(5739);
6159661581
const IS_POST = !!core.getState('isPost');
6159761582
const main = async () => {
6159861583
try {
@@ -61674,7 +61659,6 @@ const main = async () => {
6167461659
if (xcodeVersionString !== selectedXcodeVersionString) {
6167561660
throw new Error(`Selected Xcode version ${selectedXcodeVersionString} does not match requested version ${xcodeVersionString}!`);
6167661661
}
61677-
await (0, utilities_1.SetupCCache)();
6167861662
let projectRef = await (0, xcode_1.GetProjectDetails)(credential, semver.coerce(xcodeVersionString));
6167961663
projectRef = await (0, xcode_1.ArchiveXcodeProject)(projectRef);
6168061664
projectRef = await (0, xcode_1.ExportXcodeArchive)(projectRef);

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class XcodeProject {
1313
bundleVersion: string,
1414
scheme: string,
1515
credential: AppleCredential,
16-
xcodeVersion: SemVer,
16+
xcodeVersion: SemVer
1717
) {
1818
this.projectPath = projectPath;
1919
this.projectName = projectName;

src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
RemoveCredentials
1313
} from './AppleCredential';
1414
import semver = require('semver');
15-
import { SetupCCache } from './utilities';
1615

1716
const IS_POST = !!core.getState('isPost');
1817

@@ -94,7 +93,6 @@ const main = async () => {
9493
if (xcodeVersionString !== selectedXcodeVersionString) {
9594
throw new Error(`Selected Xcode version ${selectedXcodeVersionString} does not match requested version ${xcodeVersionString}!`);
9695
}
97-
await SetupCCache();
9896
let projectRef = await GetProjectDetails(credential, semver.coerce(xcodeVersionString));
9997
projectRef = await ArchiveXcodeProject(projectRef);
10098
projectRef = await ExportXcodeArchive(projectRef);

src/xcode.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -963,26 +963,13 @@ async function execXcodeBuild(xcodeBuildArgs: string[]) {
963963
output += data.toString();
964964
}
965965
},
966-
env: {
967-
...process.env,
968-
CC: 'ccache clang',
969-
CXX: 'ccache clang++',
970-
PATH: `${process.env.CCACHE_BIN}:${process.env.PATH}`,
971-
CCACHE_LOGFILE: path.join(process.cwd(), 'ccache.log')
972-
},
966+
env: { ...process.env },
973967
ignoreReturnCode: true
974968
});
975969
await parseBundleLog(output);
976970
if (exitCode !== 0) {
977971
throw new Error(`xcodebuild exited with code: ${exitCode}`);
978972
}
979-
core.startGroup('CCache');
980-
try {
981-
await exec('ccache', ['-s']);
982-
await exec('cat', [path.join(process.cwd(), 'ccache.log')]);
983-
} finally {
984-
core.endGroup();
985-
}
986973
}
987974

988975
async function execWithXcBeautify(xcodeBuildArgs: string[]) {

0 commit comments

Comments
 (0)