Skip to content

Commit

Permalink
[DEVOPS] Only build mac installers with queue=daedalus agents (input-…
Browse files Browse the repository at this point in the history
…output-hk#1568)

* only build mac installers with queue=daedalus agents

* Adds the option to skip signing

* [DEVOPS] Adds CHANGELOG entry
  • Loading branch information
disassembler authored and nikolaglumac committed Sep 17, 2019
1 parent 82c7fcf commit f61a207
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ steps:
env:
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
agents:
queue: daedalus
system: x86_64-darwin
- label: 'daedalus-x86_64-linux'
command: 'scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Changelog

### Chores

- Use "daedalus" `Buildkite` to build macOS installers ([PR 1568](https://github.com/input-output-hk/daedalus/pull/1568))
- Use improved `NumericInput` component of `React-Polymorph` v0.9.0 ([1511](https://github.com/input-output-hk/daedalus/pull/1511))
- Added minimum heights of main app window for different environments (Windows, Linux, MacOS) ([1485](https://github.com/input-output-hk/daedalus/pull/1485))
- Removed "Ada Redemption" feature ([PR 1510](https://github.com/input-output-hk/daedalus/pull/1510))
Expand Down
16 changes: 11 additions & 5 deletions installers/common/MacInstaller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ main opts@Options{..} = do
, dcAppName = installDirectory installerConfig
, dcPkgName = "org." <> (macPackageName installerConfig) <> ".pkg"
}
signing = False
print darwinConfig

ver <- getBackendVersion oBackend
Expand All @@ -78,7 +79,9 @@ main opts@Options{..} = do

tempInstaller <- makeInstaller opts darwinConfig appRoot pkg

signInstaller signingConfig tempInstaller opkg
case signing of
True -> signInstaller signingConfig tempInstaller opkg
False -> cp tempInstaller opkg

run "rm" [tt tempInstaller]
printf ("Generated "%fp%"\n") opkg
Expand All @@ -87,10 +90,13 @@ main opts@Options{..} = do
echo $ "--test-installer passed, will test the installer for installability"
procs "sudo" ["installer", "-dumplog", "-verbose", "-target", "/", "-pkg", tt opkg] empty

signed <- checkSignature opkg
case signed of
SignedOK -> pure ()
NotSigned -> rm opkg
case signing of
True -> do
signed <- checkSignature opkg
case signed of
SignedOK -> pure ()
NotSigned -> rm opkg
False -> pure ()

makePostInstall :: Format a (Text -> a)
makePostInstall = "#!/usr/bin/env bash\n" %
Expand Down

0 comments on commit f61a207

Please sign in to comment.