Skip to content

Commit 0b33638

Browse files
author
Marcin Mazurek
committed
Merge remote-tracking branch 'origin/develop' into fix/ddw-931-add-disabled-state-to-selects
2 parents 984b5c2 + 7cf7536 commit 0b33638

File tree

16 files changed

+101
-142
lines changed

16 files changed

+101
-142
lines changed

‎.github/workflows/linter.yml‎

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

‎.github/workflows/run_tests_on_pr.yml‎

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

‎.github/workflows/verify_pr.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Verify Pull Request
2+
on:
3+
pull_request:
4+
jobs:
5+
tests:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Checkout Repo
9+
uses: actions/checkout@v2
10+
- name: Setup Node.js
11+
uses: actions/setup-node@v2
12+
with:
13+
node-version: "14"
14+
- name: Restore node_modules from cache
15+
uses: actions/cache@v2
16+
with:
17+
path: '**/node_modules'
18+
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
19+
- name: Install dependencies
20+
run: yarn --frozen-lockfile
21+
- name: Run checks
22+
run: yarn check:all
23+
- name: Ensure there are no uncommited changes
24+
run: git diff --exit-code || (echo "Did you forget to run 'yarn check:all' and commit changes?" && exit 1)
25+
- name: Run tests
26+
run: yarn test:jest --maxWorkers=3

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
1616
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
1717

18+
### Fixes
19+
20+
- Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
21+
1822
## 4.9.0
1923

2024
### Features

‎default.nix‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ let
319319
electron = pkgs.callPackage ./installers/nix/electron.nix {};
320320

321321
tests = {
322-
runTsc = self.callPackage ./tests/tsc.nix {};
323-
runLint = self.callPackage ./tests/lint.nix {};
324322
runShellcheck = self.callPackage ./tests/shellcheck.nix { src = ./.;};
325323
};
326324
nix-bundle = import sources.nix-bundle { nixpkgs = pkgs; };

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"create-news-verification-hashes": "ts-node utils/create-news-verification-hashes/index.ts",
6666
"lockfile:check": "ts-node utils/lockfile-checker/index.ts --check",
6767
"lockfile:fix": "ts-node utils/lockfile-checker/index.ts --fix",
68+
"postinstall": "./scripts/postinstall.sh",
6869
"typedef:sass": "typed-scss-modules source/renderer/app"
6970
},
7071
"bin": {

‎scripts/build-cross-windows.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/usr/bin/env bash
2-
32
set -e
3+
source "$(dirname "$0")/utils.sh"
44

55
BUILDKITE_BUILD_NUMBER="$1"
66

77
upload_artifacts() {
8-
buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
8+
retry 5 buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
99
}
1010

1111
upload_artifacts_public() {
12-
buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
12+
retry 5 buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
1313
}
1414

1515
CLUSTERS="$(xargs echo -n < "$(dirname "$0")/../installer-clusters.cfg")"

‎scripts/build-installer-nix.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/usr/bin/env bash
2-
32
set -e
3+
source "$(dirname "$0")/utils.sh"
44

55
BUILDKITE_BUILD_NUMBER="$1"
66

77
upload_artifacts() {
8-
buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
8+
retry 5 buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
99
}
1010

1111
upload_artifacts_public() {
12-
buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
12+
retry 5 buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
1313
}
1414

1515
rm -rf dist || true

‎scripts/build-installer-unix.sh‎

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,14 @@
11
#!/usr/bin/env bash
2+
set -e
3+
source "$(dirname "$0")/utils.sh"
4+
25
# DEPENDENCIES (binaries should be in PATH):
36
# 0. 'git'
47
# 1. 'curl'
58
# 2. 'nix-shell'
69

7-
set -e
8-
910
CLUSTERS="$(xargs echo -n < "$(dirname "$0")"/../installer-clusters.cfg)"
1011

11-
usage() {
12-
test -z "$1" || { echo "ERROR: $*" >&2; echo >&2; }
13-
cat >&2 <<EOF
14-
Usage:
15-
$0 OPTIONS*
16-
17-
Build a Daedalus installer.
18-
19-
Options:
20-
--clusters "[CLUSTER-NAME...]"
21-
Build installers for CLUSTERS. Defaults to "mainnet staging testnet"
22-
--fast-impure Fast, impure, incremental build
23-
--build-id BUILD-NO Identifier of the build; defaults to '0'
24-
25-
--nix-path NIX-PATH NIX_PATH value
26-
27-
--upload-s3 Upload the installer to S3
28-
--test-installer Test the installer for installability
29-
30-
--verbose Verbose operation
31-
--quiet Disable verbose operation
32-
33-
EOF
34-
test -z "$1" || exit 1
35-
}
36-
37-
arg2nz() { test $# -ge 2 -a ! -z "$2" || usage "empty value for" "$1"; }
38-
fail() { echo "ERROR: $*" >&2; exit 1; }
39-
retry() {
40-
local tries=$1; arg2nz "iteration count" "$1"; shift
41-
for i in $(seq 1 "${tries}")
42-
do if "$@"
43-
then return 0
44-
else echo "failed, retry #$i of ${tries}"
45-
fi
46-
sleep 5s
47-
done
48-
fail "persistent failure to exec: $*"
49-
}
50-
5112
###
5213
### Argument processing
5314
###
@@ -76,8 +37,8 @@ while test $# -ge 1
7637
do case "$1" in
7738
--clusters ) CLUSTERS="$2"; shift;;
7839
--fast-impure ) export fast_impure=true;;
79-
--build-id ) arg2nz "build identifier" "$2"; build_id="$2"; shift;;
80-
--nix-path ) arg2nz "NIX_PATH value" "$2";
40+
--build-id ) validate_arguments "build identifier" "$2"; build_id="$2"; shift;;
41+
--nix-path ) validate_arguments "NIX_PATH value" "$2";
8142
export NIX_PATH="$2"; shift;;
8243
--test-installer ) test_installer="--test-installer";;
8344

@@ -117,11 +78,11 @@ export PATH=$HOME/.local/bin:$PATH
11778
if [ -n "${NIX_SSL_CERT_FILE-}" ]; then export SSL_CERT_FILE=$NIX_SSL_CERT_FILE; fi
11879

11980
upload_artifacts() {
120-
buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
81+
retry 5 buildkite-agent artifact upload "$@" --job "$BUILDKITE_JOB_ID"
12182
}
12283

12384
upload_artifacts_public() {
124-
buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
85+
retry 5 buildkite-agent artifact upload "$@" "${ARTIFACT_BUCKET:-}" --job "$BUILDKITE_JOB_ID"
12586
}
12687

12788
function checkItnCluster() {

‎scripts/postinstall.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ "$CI" != "true" ]]; then
4+
yarn lockfile:fix
5+
fi

0 commit comments

Comments
 (0)