Merge pull request #3116 from input-output-hk/chore/new-darwin-builders

Author: danielmain

.buildkite/pipeline.yml

@@ -9,29 +9,29 @@ steps:
     key: 'trigger-aarch64-darwin'
 
   - label: 'daedalus-x86_64-darwin'
-    command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-unstable.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
     depends_on: 'trigger-x86_64-darwin'
     agents:
-      queue: daedalus
+      queue: lace
       system: x86_64-darwin
 
   - label: 'daedalus-aarch64-darwin'
-    command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-unstable.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
     depends_on: 'trigger-aarch64-darwin'
-    env:
-      UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
     agents:
-      queue: daedalus
+      queue: lace
       system: aarch64-darwin
 
   - label: 'daedalus-x86_64-linux-nix'
-    command: 'scripts/with-nix-2.5.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-unstable.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
     agents:
+      queue: lace
       system: x86_64-linux
 
   - label: 'daedalus-x86_64-windows-nix'
-    command: 'scripts/with-nix-2.5.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-unstable.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
     agents:
+      queue: lace
       system: x86_64-linux
 
   # TODO: Re-enable once script is fixed

CHANGELOG.md

@@ -8,8 +8,9 @@
 
 ### Chores
 
-- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
+- Prepared an official `aarch64-darwin` build ([PR 3116](https://github.com/input-output-hk/daedalus/pull/3116))
 - Added regeneration of dev TLS certificates for cardano-wallet on each nix-shell entry ([PR 3117](https://github.com/input-output-hk/daedalus/pull/3117))
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
 
 ## 5.2.0
 

installers/common/MacInstaller.hs

@@ -121,7 +121,9 @@ XML_PATH="$4"
 ABS_PATH="$(pwd)/$REL_PATH"
 TS="$(date +%Y-%m-%d_%H-%M-%S)"
 function sign_cmd() {
-  codesign --verbose=4 --deep --strict --timestamp --options=runtime --entitlements $XML_PATH --sign "$SIGN_ID" "$1" 2>&1 | tee -a /tmp/codesign-output-${TS}.txt
+  for targetFile in "$@" ; do
+    codesign --force --verbose=4 --deep --strict --timestamp --options=runtime --entitlements $XML_PATH --sign "$SIGN_ID" "$targetFile" 2>&1 | tee -a /tmp/codesign-output-${TS}.txt
+  done
 }
 VERIFY_CMD="codesign --verbose=4 --verify --deep --strict"
 ENTITLEMENT_CMD="codesign -d --entitlements :-"
@@ -160,6 +162,7 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Rel
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-arm64-"*"/tiny-secp256k1.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/build/Release/detection.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/bin/darwin-arm64-"*"/usb-detection.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/bin/darwin-x64-"*"/node-hid.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/build/Release/HID.node"
 
@@ -182,6 +185,8 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
     <true/>
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
   </dict>
 </plist>|]
 

scripts/build-installer-unix.sh

@@ -135,12 +135,7 @@ pushd installers
                   then
                           echo "Uploading the installer package.."
                           export PATH=${BUILDKITE_BIN_PATH:-}:$PATH
-                          if [ -n "${UPLOAD_DIR_OVERRIDE:-}" ] ; then
-                            upload_dir="$UPLOAD_DIR_OVERRIDE"
-                            mv "$APP_NAME" "$upload_dir"
-                          else
-                            upload_dir="$APP_NAME"
-                          fi
+                          upload_dir="$APP_NAME"
                           upload_artifacts_public "${upload_dir}/*"
                           mv "launcher-config.yaml" "launcher-config-${cluster}.macos64.yaml"
                           upload_artifacts "launcher-config-${cluster}.macos64.yaml"

scripts/with-nix-2.5.sh renamed to scripts/with-nix-unstable.sh

@@ -8,8 +8,8 @@ fi
 
 echo "~~~ Obtaining ‘pkgs.nixUnstable’"
 
-myDir=$(dirname "$0")
-nixUnstable=$(nix-build "$myDir"/../default.nix -A pkgs.nixUnstable)
+# fe2ecaf706a5907b5e54d979fbde4924d84b65fc is nixos-unstable on 2023-04-13
+nixUnstable=$(nix-build https://github.com/NixOS/nixpkgs/archive/fe2ecaf706a5907b5e54d979fbde4924d84b65fc.tar.gz -A pkgs.nixUnstable)
 
 PATH="$nixUnstable/bin:$PATH"