Skip to content

Commit 167688e

Browse files
Update MacOS DMG signing and notarization process via bazel-distribution (#787)
## What is the goal of this PR? We update the packaging and signing tools used by `//:assemble-platform` to correctly sign the MacOS package vis-à-vis changes in JVM17, XCode 13+, and Apple notarization process. See typedb/bazel-distribution#391 for more details.
1 parent 20032f5 commit 167688e

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.circleci/config.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ executors:
3333

3434
mac-arm64:
3535
macos:
36-
xcode: "12.5.1"
36+
xcode: "13.4.1"
3737
resource_class: macos.m1.medium.gen1
3838
working_directory: ~/typedb-studio
3939

4040
mac-x86_64:
4141
macos:
42-
xcode: "12.5.1"
42+
xcode: "13.4.1"
4343
working_directory: ~/typedb-studio
4444

4545

@@ -61,6 +61,10 @@ commands:
6161
steps:
6262
- run: brew install bazelisk
6363

64+
assemble-mac:
65+
steps:
66+
- run: bazel build //:assemble-platform --compilation_mode=opt --define APPLE_CODE_SIGN=yes --define APPLE_ID=$APPLE_ID --define APPLE_ID_PASSWORD=$APPLE_ID_PASSWORD --define APPLE_TEAM_ID=$APPLE_TEAM_ID --define APPLE_CODE_SIGNING_CERT_PASSWORD=$APPLE_CODE_SIGNING_CERT_PASSWORD --spawn_strategy=local
67+
6468
jobs:
6569
build-mac-arm64:
6670
executor: mac-arm64
@@ -71,7 +75,7 @@ jobs:
7175
export ARTIFACT_USERNAME=$REPO_VATICLE_USERNAME
7276
export ARTIFACT_PASSWORD=$REPO_VATICLE_PASSWORD
7377
bazel run @vaticle_dependencies//distribution/artifact:create-netrc
74-
- run: bazel build //:assemble-platform --compilation_mode=opt --define APPLE_CODE_SIGN=yes --define APPLE_ID=$APPLE_ID --define APPLE_ID_PASSWORD=$APPLE_ID_PASSWORD --define APPLE_CODE_SIGNING_CERT_PASSWORD=$APPLE_CODE_SIGNING_CERT_PASSWORD --spawn_strategy=local
78+
- assemble-mac
7579
- run: |
7680
mkdir -p ~/src && cp bazel-bin/assemble-platform.zip ~/src
7781
mkdir -p ~/dist && cd ~/dist && jar xf ~/src/assemble-platform.zip
@@ -89,7 +93,7 @@ jobs:
8993
export ARTIFACT_USERNAME=$REPO_VATICLE_USERNAME
9094
export ARTIFACT_PASSWORD=$REPO_VATICLE_PASSWORD
9195
bazel run @vaticle_dependencies//distribution/artifact:create-netrc
92-
- run: bazel build //:assemble-platform --compilation_mode=opt --define APPLE_CODE_SIGN=yes --define APPLE_ID=$APPLE_ID --define APPLE_ID_PASSWORD=$APPLE_ID_PASSWORD --define APPLE_CODE_SIGNING_CERT_PASSWORD=$APPLE_CODE_SIGNING_CERT_PASSWORD --spawn_strategy=local
96+
- assemble-mac
9397
- run: |
9498
mkdir -p ~/src && cp bazel-bin/assemble-platform.zip ~/src
9599
mkdir -p ~/dist && cd ~/dist && jar xf ~/src/assemble-platform.zip

.factory/automation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ release:
7777
command: |
7878
git checkout -b release
7979
git push -f origin release
80-
echo "Successfully pushed branch 'release', which triggers a release workflow in CircleCI. The progress of the release can be tracked there."
80+
echo "Successfully pushed branch 'release', which triggers a release workflow in CircleCI. The progress of the release can be tracked here: https://app.circleci.com/pipelines/github/vaticle/typedb-studio"

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ load("@vaticle_dependencies//tool/common:deps.bzl", "vaticle_dependencies_ci_pip
106106
#####################################################################
107107
# Load @vaticle_bazel_distribution from (@vaticle_dependencies) #
108108
#####################################################################
109-
load("@vaticle_dependencies//distribution:deps.bzl", "vaticle_bazel_distribution")
109+
load("//dependencies/vaticle:repositories.bzl", "vaticle_bazel_distribution")
110110
vaticle_bazel_distribution()
111111

112112
# Load //pip

dependencies/vaticle/repositories.bzl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717

1818
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
1919

20+
def vaticle_bazel_distribution():
21+
git_repository(
22+
name = "vaticle_bazel_distribution",
23+
remote = "https://github.com/vaticle/bazel-distribution",
24+
commit = "724aa176da48d126296bd4d3ef07c4905b8a82c8",
25+
)
26+
2027
def vaticle_dependencies():
2128
git_repository(
2229
name = "vaticle_dependencies",
@@ -35,12 +42,12 @@ def vaticle_typedb_common():
3542
git_repository(
3643
name = "vaticle_typedb_common",
3744
remote = "https://github.com/vaticle/typedb-common",
38-
tag = "2.24.10", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
45+
tag = "2.24.14", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
3946
)
4047

4148
def vaticle_typedb_driver():
4249
git_repository(
4350
name = "vaticle_typedb_driver",
4451
remote = "https://github.com/vaticle/typedb-driver",
45-
tag = "2.24.11", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_client_java
52+
tag = "2.24.14", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_client_java
4653
)

0 commit comments

Comments
 (0)