Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge queue: embarking main (290ccf2) and [#7682 + #7731 + #7730] together #7776

Closed
wants to merge 75 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
2cab03c
ref(workflows): consolidate workflows based on their purpose
gustavovalverde Sep 25, 2023
59e8f11
fix(workflows): use correct name for patch
gustavovalverde Sep 25, 2023
9f251b7
fix(workflow): docker unit tests
gustavovalverde Sep 25, 2023
6bc35ed
fix(release): validation error
gustavovalverde Sep 25, 2023
6306a7d
fix(workflows): reference correct name
gustavovalverde Sep 25, 2023
c78dbd2
fix: remove extra workflow
gustavovalverde Sep 25, 2023
964650f
fix(workflows): use larger runners
gustavovalverde Sep 25, 2023
8c6fb2f
Merge branch 'main' into refactor-workflows
gustavovalverde Sep 26, 2023
600b08a
Merge branch 'main' into refactor-workflows
gustavovalverde Sep 26, 2023
23b76ff
fix(workflow): remove code already in docker unit-test
gustavovalverde Sep 26, 2023
d5ca031
fix(unit-tests): start zebra the right way
gustavovalverde Sep 26, 2023
572b593
fix: typo in patch name
gustavovalverde Sep 26, 2023
b17c109
chore: move job to logical order
gustavovalverde Sep 26, 2023
bd6f72c
Merge branch 'main' into refactor-workflows
gustavovalverde Oct 4, 2023
43f089d
imp(workflows): use better name for gcp tests
gustavovalverde Oct 5, 2023
f3426d7
Merge branch 'main' into refactor-workflows
gustavovalverde Oct 5, 2023
3dce369
ref(workflow): use a single job to run GCP tests
gustavovalverde Oct 5, 2023
f4358b2
fix(ci): do not format existing cached states if required
gustavovalverde Oct 5, 2023
46d8bb4
test: wait for the instance to be fully ready
gustavovalverde Oct 5, 2023
6f9d0f1
fix(ci): use correct logic before formating
gustavovalverde Oct 5, 2023
6fe96d8
fix: use correct condition
gustavovalverde Oct 5, 2023
bd32761
fix: get more information
gustavovalverde Oct 5, 2023
6cecf7a
fix(ci): use better shell handling and upgrade OS
gustavovalverde Oct 6, 2023
15107e7
fix(ci): use better approach
gustavovalverde Oct 6, 2023
97a833e
fix: `$DISK_OPTION` is not being correctly passed
gustavovalverde Oct 6, 2023
2cf694f
fix typo
gustavovalverde Oct 6, 2023
a57cbae
fix: more typos
gustavovalverde Oct 6, 2023
2fed739
fix: use busybox
gustavovalverde Oct 6, 2023
be48482
fix: mount Docker volume at run and not before
gustavovalverde Oct 6, 2023
82ea71f
fix: use correct condition and simpler while
gustavovalverde Oct 6, 2023
7d15390
Merge branch 'main' into refactor-workflows
gustavovalverde Oct 9, 2023
76a6b8a
Merge branch 'main' into refactor-workflows
gustavovalverde Oct 11, 2023
f600196
add: missing merge changes
gustavovalverde Oct 11, 2023
3db9e6c
chore: use better name for find-disks
gustavovalverde Oct 11, 2023
2871b2f
Adds zs_iter_opts method
arya2 Oct 11, 2023
d815ae5
uses checked_add
arya2 Oct 11, 2023
4912320
uses zs_range_iter for other read methods
arya2 Oct 11, 2023
eac74b8
fix(ci): use the `entrypoint.sh` to change the Network
gustavovalverde Oct 11, 2023
982b0b4
Merge branch 'refactor-workflows' into ref-dry-workflows
gustavovalverde Oct 11, 2023
ecb938b
fix(ci): add missing `ZEBRA_CONF_PATH` variable
gustavovalverde Oct 11, 2023
defb314
fix(ci): considerate new updates to jobs
gustavovalverde Oct 11, 2023
6fe2870
fix(ci): allow to build the entrypoint file with testnet
gustavovalverde Oct 11, 2023
97e7a14
fix(entrypoint): allow to create a dir and file with a single variable
gustavovalverde Oct 11, 2023
ec92cf8
fix(ci): add missing jobs to `failure-issue`
gustavovalverde Oct 11, 2023
50b9351
Merge branch 'refactor-workflows' into ref-dry-workflows
gustavovalverde Oct 11, 2023
1ce960b
fixes bug
arya2 Oct 11, 2023
bd80289
Fixes bug in zs_iter_opts
arya2 Oct 12, 2023
a703d1c
Adds test & updates method docs
arya2 Oct 12, 2023
7814d5f
updates docs
arya2 Oct 12, 2023
b3fc1cd
Update zebra-state/src/service/finalized_state/disk_db/tests.rs
arya2 Oct 12, 2023
59dba97
Corrects code comment
arya2 Oct 12, 2023
f3eac7c
Apply suggestions from code review
gustavovalverde Oct 12, 2023
a32b374
fix(ci): use better comment
gustavovalverde Oct 12, 2023
fcf171f
adds support for variable-sized keys
arya2 Oct 13, 2023
600aa5f
adds test case
arya2 Oct 13, 2023
43ae06e
refactor: test config file in CI and CD with a reusable workflow
gustavovalverde Oct 17, 2023
962e320
Merge branch 'main' into refactor-workflows
gustavovalverde Oct 17, 2023
4082340
fix(ci): wrong name used
gustavovalverde Oct 17, 2023
2bbed80
fix(ci): use checkout
gustavovalverde Oct 17, 2023
e7f6170
fix(ci): improve docker config tests
gustavovalverde Oct 17, 2023
77b744d
fix(ci): use better name for protection rules
gustavovalverde Oct 17, 2023
1fc1422
Merge branch 'refactor-workflows' into ref-dry-workflows
gustavovalverde Oct 17, 2023
4d2de6f
Updates docs
arya2 Oct 17, 2023
9cf67fb
Applies suggestions from code review
arya2 Oct 17, 2023
1c595fb
Add extra checks
teor2345 Oct 18, 2023
f644562
Fix test code and rustfmt
teor2345 Oct 18, 2023
cbca334
fixes test
arya2 Oct 18, 2023
da0afea
fixes test
arya2 Oct 18, 2023
8a5e4c7
Add missing timeouts to CI and CD tests
teor2345 Oct 18, 2023
3e99e30
Remove timeout keys that are not allowed by the syntax
teor2345 Oct 18, 2023
0401bec
Merge branch 'main' into ref-dry-workflows
gustavovalverde Oct 18, 2023
9afdbeb
chore: missing merge conflicts
gustavovalverde Oct 18, 2023
8129f81
Merge of #7682
mergify[bot] Oct 19, 2023
29d3ed2
Merge of #7731
mergify[bot] Oct 19, 2023
e53069c
Merge of #7730
mergify[bot] Oct 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci-build-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ jobs:

build:
name: Build ${{ matrix.crate }} crate
timeout-minutes: 90
needs: [ matrix, check-matrix ]
runs-on: ubuntu-latest
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci-unit-tests-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
# TODO: turn this test and the getblocktemplate test into a matrix, so the jobs use exactly the same diagnostics settings
test-all:
name: Test all
timeout-minutes: 180
runs-on: ubuntu-latest-xl
needs: build
steps:
Expand Down Expand Up @@ -144,6 +145,7 @@ jobs:
# (The gRPC feature is a zebrad feature, so it isn't needed here.)
test-fake-activation-heights:
name: Test with fake activation heights
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand All @@ -167,6 +169,7 @@ jobs:
# (We activate the gRPC feature to avoid recompiling `zebrad`, but we don't actually run any gRPC tests.)
test-empty-sync:
name: Test checkpoint sync from empty state
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand All @@ -189,6 +192,7 @@ jobs:
# (We activate the gRPC feature to avoid recompiling `zebrad`, but we don't actually run any gRPC tests.)
test-lightwalletd-integration:
name: Test integration with lightwalletd
timeout-minutes: 60
runs-on: ubuntu-latest
needs: build
steps:
Expand Down
Loading
Loading