Skip to content

Commit 9f14543

Browse files
committed
fix(CI): Disabling code signing for macOS by default.
Signed-off-by: Iva Horn <[email protected]>
1 parent 4982887 commit 9f14543

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

.github/workflows/macos-build-and-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ jobs:
5959
key: ${{ runner.os }}-craft-${{ hashFiles(inputs.CRAFT_MASTER_CONFIG) }}
6060

6161
- name: Build nextcloud-client
62+
env:
63+
CODE_SIGNING_REQUIRED: "NO"
64+
CODE_SIGNING_ALLOWED: "NO"
65+
CODE_SIGN_IDENTITY: ""
66+
CODE_SIGN_STYLE: "Manual"
6267
run: |
6368
python "${{ inputs.CRAFT_MASTER_LOCATION }}/CraftMaster.py" --config "${{ inputs.CRAFT_MASTER_CONFIG }}" --target ${{ inputs.CRAFT_TARGET }} -c --options nextcloud-client.srcDir=${{ github.workspace }} --options nextcloud-client.buildFileProviderModule=${{ inputs.buildFileProviderModule }} nextcloud-client
6469

shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Build.xcconfig

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@
22
// SPDX-License-Identifier: GPL-2.0-or-later
33

44
//
5-
// The common name of the signing certificate to use for code signing.
6-
// It must be present in your keychain and a development certificate.
5+
// Codesigning is performed later on by Mac Crafter.
76
//
8-
CODE_SIGN_IDENTITY=Apple Development
9-
10-
//
11-
// Xcode should automatically manage signing assets.
12-
//
13-
CODE_SIGN_STYLE = Automatic
7+
CODE_SIGNING_ALLOWED=NO
8+
CODE_SIGNING_REQUIRED=NO
9+
CODE_SIGN_STYLE=Manual
1410

1511
//
1612
// The development team identifier registered with Apple.
1713
//
18-
DEVELOPMENT_TEAM=NKUJUXUJ3B
14+
DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM:default=NKUJUXUJ3B)
1915

2016
//
2117
// The app name.
2218
//
23-
OC_APPLICATION_NAME=Nextcloud
19+
OC_APPLICATION_NAME=$(OC_APPLICATION_NAME:default=Nextcloud)
2420

2521
//
2622
// Reverse base identifier.
2723
//
28-
OC_APPLICATION_REV_DOMAIN=com.nextcloud.desktopclient
24+
OC_APPLICATION_REV_DOMAIN=$(OC_APPLICATION_REV_DOMAIN:default=com.nextcloud.desktopclient)

shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Craft.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ if [ -f "$HOME/.zprofile" ]; then
1515
source "$HOME/.zprofile"
1616
fi
1717

18-
if [ -z "${CODE_SIGN_IDENTITY}" ]; then
19-
echo "Error: CODE_SIGN_IDENTITY is not defined or is empty!"
20-
exit 1
21-
fi
22-
2318
DESKTOP_CLIENT_PROJECT_ROOT="$SOURCE_ROOT/../../.."
2419

2520
if [ -d "$DESKTOP_CLIENT_PROJECT_ROOT/admin/osx/mac-crafter" ]; then
@@ -36,5 +31,5 @@ swift run mac-crafter \
3631
--dev \
3732
--disable-auto-updater \
3833
--build-file-provider-module \
39-
--code-sign-identity="$CODE_SIGN_IDENTITY" \
34+
--code-sign-identity="Apple Development" \
4035
"$DESKTOP_CLIENT_PROJECT_ROOT"

0 commit comments

Comments
 (0)