Skip to content

Commit 51ddcc0

Browse files
- test license step - update deps - misc formatting - update default macOS entitlements to use hardened runtime
1 parent 2bd0367 commit 51ddcc0

File tree

5 files changed

+25
-20
lines changed

5 files changed

+25
-20
lines changed

dist/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20070,7 +20070,7 @@ function expand(str, isTop) {
2007020070
var isOptions = m.body.indexOf(',') >= 0;
2007120071
if (!isSequence && !isOptions) {
2007220072
// {a},b}
20073-
if (m.post.match(/,.*\}/)) {
20073+
if (m.post.match(/,(?!,).*\}/)) {
2007420074
str = m.pre + '{' + m.body + escClose + m.post;
2007520075
return expand(str);
2007620076
}
@@ -58739,7 +58739,7 @@ async function ArchiveXcodeProject(projectRef) {
5873958739
const entitlementsHandle = await fs.promises.open(projectRef.entitlementsPath, fs.constants.O_RDONLY);
5874058740
try {
5874158741
const entitlementsContent = await fs.promises.readFile(entitlementsHandle, 'utf8');
58742-
core.debug(`----- Entitlements content: -----\n${entitlementsContent}\n-----------------------------------`);
58742+
core.info(`----- Entitlements content: -----\n${entitlementsContent}\n-----------------------------------`);
5874358743
}
5874458744
finally {
5874558745
await entitlementsHandle.close();
@@ -59216,8 +59216,10 @@ async function getDefaultEntitlementsMacOS(projectRef) {
5921659216
break;
5921759217
default:
5921859218
defaultEntitlements = {
59219-
'com.apple.security.cs.disable-library-validation': true,
59219+
'com.apple.security.cs.allow-jit': true,
59220+
'com.apple.security.cs.allow-unsigned-executable-memory': true,
5922059221
'com.apple.security.cs.allow-dyld-environment-variables': true,
59222+
'com.apple.security.cs.disable-library-validation': true,
5922159223
'com.apple.security.cs.disable-executable-page-protection': true,
5922259224
};
5922359225
break;

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.

package-lock.json

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "unity-xcode-builder",
3-
"version": "1.3.1",
3+
"version": "1.3.2",
44
"description": "A GitHub Action to build, archive, and upload Unity exported xcode projects.",
55
"author": "buildalon",
66
"license": "MIT",
@@ -25,7 +25,7 @@
2525
"uuid": "^10.0.0"
2626
},
2727
"devDependencies": {
28-
"@types/node": "^22.15.21",
28+
"@types/node": "^22.15.33",
2929
"@types/plist": "^3.0.5",
3030
"@types/semver": "^7.7.0",
3131
"@types/uuid": "^10.0.0",
@@ -39,4 +39,4 @@
3939
"watch": "ncc build src/index.ts -o dist --source-map --license licenses.txt --watch",
4040
"clean": "npm install && shx rm -rf dist/ out/ node_modules/ && npm ci"
4141
}
42-
}
42+
}

src/xcode.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ export async function ArchiveXcodeProject(projectRef: XcodeProject): Promise<Xco
402402
const entitlementsHandle = await fs.promises.open(projectRef.entitlementsPath, fs.constants.O_RDONLY);
403403
try {
404404
const entitlementsContent = await fs.promises.readFile(entitlementsHandle, 'utf8');
405-
core.debug(`----- Entitlements content: -----\n${entitlementsContent}\n-----------------------------------`);
405+
core.info(`----- Entitlements content: -----\n${entitlementsContent}\n-----------------------------------`);
406406
} finally {
407407
await entitlementsHandle.close();
408408
}
@@ -741,7 +741,7 @@ async function notarizeArchive(projectRef: XcodeProject, archivePath: string, st
741741
}
742742
}
743743

744-
async function getNotarizationLog(projectRef: XcodeProject, id: string) {
744+
async function getNotarizationLog(projectRef: XcodeProject, id: string): Promise<void> {
745745
let output = '';
746746
const notaryLogArgs = [
747747
'notarytool',
@@ -866,10 +866,12 @@ async function getDefaultEntitlementsMacOS(projectRef: XcodeProject): Promise<vo
866866
};
867867
break;
868868
default:
869-
// steam: https://partner.steamgames.com/doc/store/application/platforms#3
869+
// use default hardened runtime entitlements
870870
defaultEntitlements = {
871-
'com.apple.security.cs.disable-library-validation': true,
871+
'com.apple.security.cs.allow-jit': true,
872+
'com.apple.security.cs.allow-unsigned-executable-memory': true,
872873
'com.apple.security.cs.allow-dyld-environment-variables': true,
874+
'com.apple.security.cs.disable-library-validation': true,
873875
'com.apple.security.cs.disable-executable-page-protection': true,
874876
};
875877
break;

0 commit comments

Comments
 (0)