Skip to content

Commit be15922

Browse files
author
Marcin Mazurek
authored
Merge pull request #3144 from input-output-hk/merge-release-5.3.0-into-main
Merge release/5.3.0 into main
2 parents e0e942d + e11176d commit be15922

File tree

144 files changed

+3327
-3800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+3327
-3800
lines changed

.buildkite/pipeline.yml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
11
env:
2+
23
ARTIFACT_BUCKET: s3://ci-output-sink
4+
35
steps:
6+
7+
# XXX: `</dev/null turns off any interactive questions from Nix (e.g. accept-flake-config)
8+
9+
- input: ':recycle: Trigger ‘x86_64-darwin’'
10+
key: 'trigger-x86_64-darwin'
11+
12+
- input: ':recycle: Trigger ‘aarch64-darwin’'
13+
key: 'trigger-aarch64-darwin'
14+
415
- label: 'daedalus-x86_64-darwin'
5-
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
6-
env:
7-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
16+
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.x86_64-darwin.buildkitePipeline'
17+
depends_on: 'trigger-x86_64-darwin'
818
agents:
9-
queue: daedalus
19+
queue: lace
1020
system: x86_64-darwin
21+
1122
- label: 'daedalus-aarch64-darwin'
12-
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
23+
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.aarch64-darwin.buildkitePipeline'
24+
depends_on: 'trigger-aarch64-darwin'
1325
env:
14-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
15-
UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
26+
# XXX: avoid Böhm GC segfaults in Nix on aarch64-darwin:
27+
GC_DONT_GC: 1
1628
agents:
17-
queue: daedalus
29+
queue: lace
1830
system: aarch64-darwin
19-
- label: 'daedalus-x86_64-linux-nix'
20-
command: 'scripts/with-nix-2.5.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
31+
32+
- label: 'daedalus-x86_64-linux'
33+
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.x86_64-linux.buildkitePipeline'
2134
agents:
35+
queue: lace
2236
system: x86_64-linux
23-
- label: 'daedalus-x86_64-windows-nix'
24-
command: 'scripts/with-nix-2.5.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
37+
38+
- label: 'daedalus-x86_64-windows'
39+
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.x86_64-linux.buildkitePipeline-x86_64-windows'
2540
agents:
41+
queue: lace
2642
system: x86_64-linux
27-
28-
# TODO: Re-enable once script is fixed
29-
# - label: 'release.nix'
30-
# command: 'ci/check-hydra.sh'
31-
# agents:
32-
# system: x86_64-linux

.eslintrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,12 @@
9696
"plugins": ["@typescript-eslint", "import", "promise", "react", "jest"],
9797
"globals": {
9898
"API": true,
99-
"API_VERSION": true,
99+
"CARDANO_WALLET_VERSION": true,
100+
"CARDANO_NODE_VERSION": true,
100101
"NETWORK": true,
101-
"BUILD_NUMBER": true,
102+
"BUILD_REV": true,
103+
"BUILD_REV_SHORT": true,
104+
"BUILD_COUNTER": true,
102105
"Process": true // TODO: remove after fix
103106
},
104107
"settings": {

.github/pull_request_template.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ Open a thread on #daedalus-qa on Slack, mention `@daedalusqa` and `@daedalusteam
4141
- [ ] PR assigned to the PR author(s)
4242
- [ ] `input-output-hk/daedalus-dev` and `input-output-hk/daedalus-qa` assigned as PR reviewers
4343
- [ ] If there are UI changes, Alexander Rukin assigned as an additional reviewer
44-
- [ ] All visual regression testing has been reviewed (assign `run Chromatic` label to PR to trigger the run)
4544
- [ ] PR has appropriate labels (`release-vNext`, `feature`/`bug`/`chore`, `WIP`)
4645
- [ ] PR link is added to a Jira ticket, ticket moved to In Review
4746
- [ ] PR is updated to the most recent version of the target branch (and there are no conflicts)

.github/workflows/chromatic.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ installers/csl-daedalus/
5151
installers/delegation.cert
5252
installers/signing.key
5353

54-
# temporary certs for daedalus dev
55-
tls/client
56-
tls/server
57-
5854
# App packaged
5955
dist
6056
release

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
# Changelog
22

3+
## 5.3.0
4+
5+
### Features
6+
7+
- Apply Catalyst API improvements ([PR 3136](https://github.com/input-output-hk/daedalus/pull/3136))
8+
- Switched to the new Catalyst API ([PR 3129](https://github.com/input-output-hk/daedalus/pull/3129))
9+
- Updated Catalyst links ([PR 3137](https://github.com/input-output-hk/daedalus/pull/3137))
10+
11+
### Fixes
12+
13+
- Fixed decimals for syncing percentage ([PR 3106](https://github.com/input-output-hk/daedalus/pull/3106))
14+
15+
### Chores
16+
17+
- Switched from Cicero to Hydra ([PR 3135](https://github.com/input-output-hk/daedalus/pull/3135))
18+
- Changed voting reward address to a payment address ([PR 3131](https://github.com/input-output-hk/daedalus/pull/3131))
19+
- Updated @trezor/connect to v9.0.8 ([PR 3127](https://github.com/input-output-hk/daedalus/pull/3127))
20+
- Add members of Cardano Wallet team to the "About Daedalus" screen ([PR 3092](https://github.com/input-output-hk/daedalus/pull/3092))
21+
- Removed Chromatic from project ([PR 3126](https://github.com/input-output-hk/daedalus/pull/3126))
22+
- Upgraded Electron to 24.2, and Node.js to 18.× ([PR 3124](https://github.com/input-output-hk/daedalus/pull/3124))
23+
- Defined a proxy for currency conversions ([PR 3121](https://github.com/input-output-hk/daedalus/pull/3121))
24+
- Switched Daedalus to be built with Nix flakes ([PR 3008](https://github.com/input-output-hk/daedalus/pull/3008))
25+
- Update `cardano-wallet` to `v2023-04-14` ([PR 3104](https://github.com/input-output-hk/daedalus/pull/3104))
26+
- Prepared an official `aarch64-darwin` build ([PR 3116](https://github.com/input-output-hk/daedalus/pull/3116))
27+
- 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))
28+
- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
29+
330
## 5.2.0
431

532
### Features

CODE-OF-CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See [Code of Conduct](https://github.com/input-output-hk/cardano-engineering-handbook/blob/main/CODE-OF-CONDUCT.md)

ConfigMutator.hs

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)