fix merge

This commit is contained in:
Shane Harris
2024-05-01 20:26:56 +02:00
3 changed files with 15 additions and 5 deletions
+3 -1
View File
@@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-node@v2 - uses: actions/setup-node@v4
with: with:
node-version: '20.11.1' node-version: '20.11.1'
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
@@ -29,7 +29,9 @@ jobs:
- name: "Build application" - name: "Build application"
env: env:
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }} APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
APPLE_TEAM_ID: ${{ secrets.APPLE_ID_TEAM }}
APPLE_ID_TEAM: ${{ secrets.APPLE_ID_TEAM }} APPLE_ID_TEAM: ${{ secrets.APPLE_ID_TEAM }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.CSC_LINK }} CSC_LINK: ${{ secrets.CSC_LINK }}
+6
View File
@@ -2,7 +2,13 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key> <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/> <true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
</dict> </dict>
</plist> </plist>
+4 -2
View File
@@ -53,6 +53,9 @@
"arm64", "arm64",
"x64" "x64"
] ]
},
"notarize": {
"teamId": "778YBN5YK7"
} }
}, },
"win": { "win": {
@@ -92,8 +95,7 @@
], ],
"asarUnpack": [ "asarUnpack": [
"build/**/*" "build/**/*"
], ]
"afterSign": "build/notarize.js"
}, },
"husky": { "husky": {
"hooks": { "hooks": {