Skip to content

Commit a3c0bb8

Browse files
committed
Switch to the new Darwin builders
1 parent 543ca27 commit a3c0bb8

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

.buildkite/pipeline.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@ steps:
1111
- label: 'daedalus-x86_64-darwin'
1212
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
1313
depends_on: 'trigger-x86_64-darwin'
14-
env:
15-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
1614
agents:
1715
queue: daedalus
1816
system: x86_64-darwin
1917

2018
- label: 'daedalus-aarch64-darwin'
2119
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
2220
depends_on: 'trigger-aarch64-darwin'
23-
env:
24-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
25-
UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
2621
agents:
2722
queue: daedalus
2823
system: aarch64-darwin

scripts/build-installer-unix.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,7 @@ pushd installers
135135
then
136136
echo "Uploading the installer package.."
137137
export PATH=${BUILDKITE_BIN_PATH:-}:$PATH
138-
if [ -n "${UPLOAD_DIR_OVERRIDE:-}" ] ; then
139-
upload_dir="$UPLOAD_DIR_OVERRIDE"
140-
mv "$APP_NAME" "$upload_dir"
141-
else
142-
upload_dir="$APP_NAME"
143-
fi
138+
upload_dir="$APP_NAME"
144139
upload_artifacts_public "${upload_dir}/*"
145140
mv "launcher-config.yaml" "launcher-config-${cluster}.macos64.yaml"
146141
upload_artifacts "launcher-config-${cluster}.macos64.yaml"

0 commit comments

Comments
 (0)