From 7f8c755620b7f3dac916504f0a52fa4daff16943 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Fri, 23 Sep 2022 13:39:39 +0200 Subject: [PATCH 01/14] ref: use nightly toolchain for json output --- .github/workflows/zcashd.yml | 6 ++++-- .github/workflows/zebra.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 9814991f..5ab2400b 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -33,7 +33,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: nightly override: true - uses: Swatinem/rust-cache@v1 - uses: actions-rs/cargo@v1 @@ -65,9 +65,11 @@ jobs: echo kind = \"zcashd\" >> ~/.ziggurat/config.toml echo path = \"./zcash\" >> ~/.ziggurat/config.toml echo start_command = \"../zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml + cat ~/.ziggurat/config.toml - run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test + ls -R chmod +x ziggurat_test chmod +x zcashd - ./ziggurat_test --test-threads=1 + sudo ./ziggurat_test --test-threads=1 -Z unstable-options --format json diff --git a/.github/workflows/zebra.yml b/.github/workflows/zebra.yml index e4b817e7..5c7b406c 100644 --- a/.github/workflows/zebra.yml +++ b/.github/workflows/zebra.yml @@ -33,7 +33,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: nightly override: true - uses: Swatinem/rust-cache@v1 - uses: actions-rs/cargo@v1 @@ -74,4 +74,4 @@ jobs: rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test - ./ziggurat_test --test-threads=1 \ No newline at end of file + ./ziggurat_test --test-threads=1 -Z unstable-options --format json From 7016d84d113ba0c2f42c554213675072ba17a758 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Mon, 26 Sep 2022 12:53:42 +0200 Subject: [PATCH 02/14] ref(ci): use absolute path in config.toml --- .github/workflows/zcashd.yml | 6 +++--- .github/workflows/zebra.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 5ab2400b..0be9ad89 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -63,13 +63,13 @@ jobs: mkdir ~/.ziggurat/ touch ~/.ziggurat/config.toml echo kind = \"zcashd\" >> ~/.ziggurat/config.toml - echo path = \"./zcash\" >> ~/.ziggurat/config.toml - echo start_command = \"../zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml + echo path = \"zcashd\" >> ~/.ziggurat/config.toml + echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml cat ~/.ziggurat/config.toml - run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test - ls -R chmod +x ziggurat_test chmod +x zcashd + ls -Rla sudo ./ziggurat_test --test-threads=1 -Z unstable-options --format json diff --git a/.github/workflows/zebra.yml b/.github/workflows/zebra.yml index 5c7b406c..326e6624 100644 --- a/.github/workflows/zebra.yml +++ b/.github/workflows/zebra.yml @@ -65,7 +65,7 @@ jobs: mkdir ~/.ziggurat/ touch ~/.ziggurat/config.toml echo kind = \"zebra\" >> ~/.ziggurat/config.toml - echo path = \"./zebra\" >> ~/.ziggurat/config.toml + echo path = \"zebra\" >> ~/.ziggurat/config.toml echo start_command = \"../zebrad/zebrad start\" >> ~/.ziggurat/config.toml - name: Download Zebra params run: | From 704241f32c32befd524b2681507bbaa95e15fa93 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Tue, 27 Sep 2022 10:32:57 +0200 Subject: [PATCH 03/14] fix(ci): chmod +x binary not directory --- .github/workflows/zcashd.yml | 6 +++--- src/setup/node.rs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 0be9ad89..96620812 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -59,17 +59,17 @@ jobs: path: ./ziggurat - name: Create ~/.ziggurat/config.toml run: | - git clone https://github.com/zcash/zcash mkdir ~/.ziggurat/ touch ~/.ziggurat/config.toml echo kind = \"zcashd\" >> ~/.ziggurat/config.toml - echo path = \"zcashd\" >> ~/.ziggurat/config.toml + echo path = \"/home/runner/work/ziggurat/ziggurat/zcashd\" >> ~/.ziggurat/config.toml echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml cat ~/.ziggurat/config.toml - run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test - chmod +x zcashd + chmod +x zcashd/zcashd + pwd ls -Rla sudo ./ziggurat_test --test-threads=1 -Z unstable-options --format json diff --git a/src/setup/node.rs b/src/setup/node.rs index 3b0108db..3972f5fa 100644 --- a/src/setup/node.rs +++ b/src/setup/node.rs @@ -282,6 +282,7 @@ impl Node { fn generate_config_file(&self) -> io::Result<()> { let config_file_path = self.meta.kind.config_filepath(&self.config.path); + println!("{:?}", config_file_path); let content = match self.meta.kind { NodeKind::Zebra => ZebraConfigFile::generate(&self.config) .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?, From 1015a62eab2e2b0baa13854f0c7954529507d8d2 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Wed, 28 Sep 2022 13:50:38 +0200 Subject: [PATCH 04/14] ci: run with --nocapture --- .github/workflows/zcashd.yml | 2 +- src/setup/node.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 96620812..9256c8b5 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -72,4 +72,4 @@ jobs: chmod +x zcashd/zcashd pwd ls -Rla - sudo ./ziggurat_test --test-threads=1 -Z unstable-options --format json + RUST_BACKTRACE=1 ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json diff --git a/src/setup/node.rs b/src/setup/node.rs index 3972f5fa..3b0108db 100644 --- a/src/setup/node.rs +++ b/src/setup/node.rs @@ -282,7 +282,6 @@ impl Node { fn generate_config_file(&self) -> io::Result<()> { let config_file_path = self.meta.kind.config_filepath(&self.config.path); - println!("{:?}", config_file_path); let content = match self.meta.kind { NodeKind::Zebra => ZebraConfigFile::generate(&self.config) .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?, From 17651bc6c5f7cd0b85230571c2ed78bb7d6f2e8b Mon Sep 17 00:00:00 2001 From: zeapoz Date: Thu, 29 Sep 2022 11:45:57 +0200 Subject: [PATCH 05/14] fix(ci): up timeouts --- .github/workflows/zcashd.yml | 2 +- src/tests/conformance/handshake/complete_handshake.rs | 2 ++ src/tools/mod.rs | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 9256c8b5..397049e8 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -72,4 +72,4 @@ jobs: chmod +x zcashd/zcashd pwd ls -Rla - RUST_BACKTRACE=1 ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json + ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json diff --git a/src/tests/conformance/handshake/complete_handshake.rs b/src/tests/conformance/handshake/complete_handshake.rs index 589ee5b4..8ffabf5c 100644 --- a/src/tests/conformance/handshake/complete_handshake.rs +++ b/src/tests/conformance/handshake/complete_handshake.rs @@ -11,6 +11,7 @@ async fn when_node_receives_connection() { // Spin up a node instance. let mut node = Node::new().unwrap(); node.initial_action(Action::WaitForConnection) + .log_to_stdout(true) .start() .await .unwrap(); @@ -47,6 +48,7 @@ async fn when_node_initiates_connection() { // Spin up a node and set the synthetic node as an initial peer. let mut node = Node::new().unwrap(); node.initial_peers(vec![synthetic_node.listening_addr()]) + .log_to_stdout(true) .start() .await .unwrap(); diff --git a/src/tools/mod.rs b/src/tools/mod.rs index 609ab269..9c1da3f7 100644 --- a/src/tools/mod.rs +++ b/src/tools/mod.rs @@ -9,9 +9,9 @@ use std::time::Duration; /// Default timeout for connection operations in seconds. /// TODO: move to config file. -pub const LONG_TIMEOUT: Duration = Duration::from_secs(10); +pub const LONG_TIMEOUT: Duration = Duration::from_secs(30); /// Default timeout for response-specific reads in seconds. -pub const RECV_TIMEOUT: Duration = Duration::from_millis(100); +pub const RECV_TIMEOUT: Duration = Duration::from_millis(300); /// Waits until an expression is true or times out. /// From ef8e59d4b929f4f9242985b4a9c71dae7c17dab9 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Thu, 29 Sep 2022 16:46:11 +0200 Subject: [PATCH 06/14] ci: fetch params --- .github/workflows/zcashd.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 397049e8..36f34b68 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -13,14 +13,14 @@ jobs: steps: - name: clone zcashd run: git clone https://github.com/zcash/zcash - - name: fetch params - run: | - cd zcash - ./zcutil/fetch-params.sh - name: build zcashd run: | cd zcash ./zcutil/build.sh -j$(nproc) + - uses: actions/upload-artifact@v2 + with: + name: zcashd-fetch-params + path: ./zcash/zcutil/fetch-params.sh - uses: actions/upload-artifact@v2 with: name: zcashd-executable @@ -49,10 +49,14 @@ jobs: runs-on: ubuntu-latest needs: [ check, install-zcashd ] steps: + - uses: actions/download-artifact@v3 + with: + name: zcashd-fetch-params + path: ./zcash - uses: actions/download-artifact@v3 with: name: zcashd-executable - path: ./zcashd + path: ./zcash - uses: actions/download-artifact@v3 with: name: ziggurat-executable @@ -62,14 +66,15 @@ jobs: mkdir ~/.ziggurat/ touch ~/.ziggurat/config.toml echo kind = \"zcashd\" >> ~/.ziggurat/config.toml - echo path = \"/home/runner/work/ziggurat/ziggurat/zcashd\" >> ~/.ziggurat/config.toml + echo path = \"/home/runner/work/ziggurat/ziggurat/zcash\" >> ~/.ziggurat/config.toml echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml - cat ~/.ziggurat/config.toml + - name: Fetch zcashd params + run: | + chmod +x zcash/fetch-params.sh + ./zcash/fetch-params.sh - run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test - chmod +x zcashd/zcashd - pwd - ls -Rla + chmod +x zcash/zcashd ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json From 8e7eeea8394c1cf37f3bbe578595f6a560374c5e Mon Sep 17 00:00:00 2001 From: zeapoz Date: Mon, 3 Oct 2022 10:50:30 +0200 Subject: [PATCH 07/14] feat(ci): init git --- .github/workflows/zcashd.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 36f34b68..a314fe72 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -70,11 +70,29 @@ jobs: echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml - name: Fetch zcashd params run: | + ls -Rla chmod +x zcash/fetch-params.sh ./zcash/fetch-params.sh - - run: | + - name: Run ziggurat suite + continue-on-error: true + env: + FILENAME: ${{ github.event.repository.updated_at }} + run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test chmod +x zcash/zcashd - ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json + mkdir results + ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json > results/$FILENAME.json + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: git + run: | + pwd + ls -Rla + git config user.name "GitHub Actions Bot" + git config user.email "<>" + git status + git add results + git commit -m "ci: `zcashd` suite results" From 2c356cfbc0dc3498739bc3bb4904c6437c4a2cbb Mon Sep 17 00:00:00 2001 From: zeapoz Date: Tue, 4 Oct 2022 13:35:43 +0200 Subject: [PATCH 08/14] ci: checkout first --- .github/workflows/zcashd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index a314fe72..e8fc94ff 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -49,6 +49,9 @@ jobs: runs-on: ubuntu-latest needs: [ check, install-zcashd ] steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - uses: actions/download-artifact@v3 with: name: zcashd-fetch-params @@ -70,7 +73,6 @@ jobs: echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml - name: Fetch zcashd params run: | - ls -Rla chmod +x zcash/fetch-params.sh ./zcash/fetch-params.sh - name: Run ziggurat suite @@ -84,9 +86,6 @@ jobs: chmod +x zcash/zcashd mkdir results ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json > results/$FILENAME.json - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - name: git run: | pwd @@ -96,3 +95,4 @@ jobs: git status git add results git commit -m "ci: `zcashd` suite results" + git push From 6782f5e0a31e8a64e330d50e25de4b17a76cc861 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Tue, 4 Oct 2022 15:25:38 +0200 Subject: [PATCH 09/14] ci: mkdir -p + remove debug --- .github/workflows/zcashd.yml | 6 ++---- src/tests/conformance/handshake/complete_handshake.rs | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index e8fc94ff..15e29453 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -84,12 +84,10 @@ jobs: mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test chmod +x zcash/zcashd - mkdir results - ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json > results/$FILENAME.json + mkdir -p results + ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json > results/$FILENAME.jsonl - name: git run: | - pwd - ls -Rla git config user.name "GitHub Actions Bot" git config user.email "<>" git status diff --git a/src/tests/conformance/handshake/complete_handshake.rs b/src/tests/conformance/handshake/complete_handshake.rs index 8ffabf5c..589ee5b4 100644 --- a/src/tests/conformance/handshake/complete_handshake.rs +++ b/src/tests/conformance/handshake/complete_handshake.rs @@ -11,7 +11,6 @@ async fn when_node_receives_connection() { // Spin up a node instance. let mut node = Node::new().unwrap(); node.initial_action(Action::WaitForConnection) - .log_to_stdout(true) .start() .await .unwrap(); @@ -48,7 +47,6 @@ async fn when_node_initiates_connection() { // Spin up a node and set the synthetic node as an initial peer. let mut node = Node::new().unwrap(); node.initial_peers(vec![synthetic_node.listening_addr()]) - .log_to_stdout(true) .start() .await .unwrap(); From 52829e836734a63a5df4c5ec154da77c21d2fc32 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Wed, 5 Oct 2022 11:06:36 +0200 Subject: [PATCH 10/14] ci: timestamp tests --- .github/workflows/zcashd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 15e29453..3abb1ca0 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -85,7 +85,7 @@ jobs: chmod +x ziggurat_test chmod +x zcash/zcashd mkdir -p results - ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --format json > results/$FILENAME.jsonl + ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --report-time --format json > results/$FILENAME.jsonl - name: git run: | git config user.name "GitHub Actions Bot" From b246eee34d5858e6638a2734475977dd1ac92de9 Mon Sep 17 00:00:00 2001 From: zeapoz Date: Thu, 6 Oct 2022 16:40:01 +0200 Subject: [PATCH 11/14] ci: tag latest result --- .github/workflows/zcashd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 3abb1ca0..afc2a6a6 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -86,11 +86,12 @@ jobs: chmod +x zcash/zcashd mkdir -p results ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --report-time --format json > results/$FILENAME.jsonl + rm -r results/latest.jsonl + cp results/$FILENAME.jsonl results/latest.jsonl - name: git run: | git config user.name "GitHub Actions Bot" git config user.email "<>" - git status git add results git commit -m "ci: `zcashd` suite results" git push From 51580ef39d4a97cb1a4e602b954418d9a6dea72f Mon Sep 17 00:00:00 2001 From: zeapoz Date: Thu, 6 Oct 2022 17:50:30 +0200 Subject: [PATCH 12/14] ci: introduce stable rust workflow --- .github/workflows/zcashd-nightly.yml | 97 ++++++++++++++++++++++++++++ .github/workflows/zcashd.yml | 16 +---- 2 files changed, 99 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/zcashd-nightly.yml diff --git a/.github/workflows/zcashd-nightly.yml b/.github/workflows/zcashd-nightly.yml new file mode 100644 index 00000000..3c858cf9 --- /dev/null +++ b/.github/workflows/zcashd-nightly.yml @@ -0,0 +1,97 @@ +name: zcashd-nightly + +on: + workflow_dispatch: + push: + branches: [ "zcash-ci" ] + # pull_request: + # branches: [ main ] + +jobs: + install-zcashd: + runs-on: ubuntu-latest + steps: + - name: clone zcashd + run: git clone https://github.com/zcash/zcash + - name: build zcashd + run: | + cd zcash + ./zcutil/build.sh -j$(nproc) + - uses: actions/upload-artifact@v2 + with: + name: zcashd-fetch-params + path: ./zcash/zcutil/fetch-params.sh + - uses: actions/upload-artifact@v2 + with: + name: zcashd-executable + path: ./zcash/src/zcashd + + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly + override: true + - uses: Swatinem/rust-cache@v1 + - uses: actions-rs/cargo@v1 + with: + command: test + args: --all-targets --no-run + - uses: actions/upload-artifact@v2 + with: + name: ziggurat-executable + path: ./target/debug/deps/ziggurat-* + + test-zcashd: + runs-on: ubuntu-latest + needs: [ check, install-zcashd ] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/download-artifact@v3 + with: + name: zcashd-fetch-params + path: ./zcash + - uses: actions/download-artifact@v3 + with: + name: zcashd-executable + path: ./zcash + - uses: actions/download-artifact@v3 + with: + name: ziggurat-executable + path: ./ziggurat + - name: Create ~/.ziggurat/config.toml + run: | + mkdir ~/.ziggurat/ + touch ~/.ziggurat/config.toml + echo kind = \"zcashd\" >> ~/.ziggurat/config.toml + echo path = \"/home/runner/work/ziggurat/ziggurat/zcash\" >> ~/.ziggurat/config.toml + echo start_command = \"./zcashd -debug=1 -printtoconsole -logips=1 -dnsseed=0 -dns=0 -listenonion=0\" >> ~/.ziggurat/config.toml + - name: Fetch zcashd params + run: | + chmod +x zcash/fetch-params.sh + ./zcash/fetch-params.sh + - name: Run ziggurat suite + continue-on-error: true + env: + FILENAME: ${{ github.event.repository.updated_at }} + run: | + rm ./ziggurat/*.d + mv ./ziggurat/ziggurat-* ziggurat_test + chmod +x ziggurat_test + chmod +x zcash/zcashd + mkdir -p results + ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --report-time --format json > results/$FILENAME.jsonl + rm -r results/latest.jsonl + cp results/$FILENAME.jsonl results/latest.jsonl + - name: git + run: | + git config user.name "GitHub Actions Bot" + git config user.email "<>" + git add results + git commit -m "ci: zcashd suite results" + git push diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index afc2a6a6..370f4fcb 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -33,7 +33,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly + toolchain: stable override: true - uses: Swatinem/rust-cache@v1 - uses: actions-rs/cargo@v1 @@ -77,21 +77,9 @@ jobs: ./zcash/fetch-params.sh - name: Run ziggurat suite continue-on-error: true - env: - FILENAME: ${{ github.event.repository.updated_at }} run: | rm ./ziggurat/*.d mv ./ziggurat/ziggurat-* ziggurat_test chmod +x ziggurat_test chmod +x zcash/zcashd - mkdir -p results - ./ziggurat_test --test-threads=1 --nocapture -Z unstable-options --report-time --format json > results/$FILENAME.jsonl - rm -r results/latest.jsonl - cp results/$FILENAME.jsonl results/latest.jsonl - - name: git - run: | - git config user.name "GitHub Actions Bot" - git config user.email "<>" - git add results - git commit -m "ci: `zcashd` suite results" - git push + ./ziggurat_test --test-threads=1 --nocapture From 154f5716331a8fc6fa954940ed87a15fd2aeb4df Mon Sep 17 00:00:00 2001 From: Jonathan <94441036+zeapoz@users.noreply.github.com> Date: Fri, 7 Oct 2022 10:31:18 +0000 Subject: [PATCH 13/14] ci: apply suggestion Co-authored-by: Mark Robert Henderson --- .github/workflows/zcashd-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zcashd-nightly.yml b/.github/workflows/zcashd-nightly.yml index 3c858cf9..1270d68c 100644 --- a/.github/workflows/zcashd-nightly.yml +++ b/.github/workflows/zcashd-nightly.yml @@ -3,7 +3,7 @@ name: zcashd-nightly on: workflow_dispatch: push: - branches: [ "zcash-ci" ] + branches: [ "main" ] # pull_request: # branches: [ main ] From 706faf4d6e95e5169a15acf70065107e49cd030d Mon Sep 17 00:00:00 2001 From: zeapoz Date: Fri, 7 Oct 2022 12:34:00 +0200 Subject: [PATCH 14/14] ci: run workflows on main --- .github/workflows/zcashd-nightly.yml | 2 -- .github/workflows/zcashd.yml | 4 +--- .github/workflows/zebra.yml | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/zcashd-nightly.yml b/.github/workflows/zcashd-nightly.yml index 1270d68c..52017310 100644 --- a/.github/workflows/zcashd-nightly.yml +++ b/.github/workflows/zcashd-nightly.yml @@ -4,8 +4,6 @@ on: workflow_dispatch: push: branches: [ "main" ] - # pull_request: - # branches: [ main ] jobs: install-zcashd: diff --git a/.github/workflows/zcashd.yml b/.github/workflows/zcashd.yml index 370f4fcb..cfef6229 100644 --- a/.github/workflows/zcashd.yml +++ b/.github/workflows/zcashd.yml @@ -3,9 +3,7 @@ name: zcashd on: workflow_dispatch: push: - branches: [ "zcash-ci" ] - # pull_request: - # branches: [ main ] + branches: [ "main" ] jobs: install-zcashd: diff --git a/.github/workflows/zebra.yml b/.github/workflows/zebra.yml index 326e6624..ad92c42c 100644 --- a/.github/workflows/zebra.yml +++ b/.github/workflows/zebra.yml @@ -3,9 +3,7 @@ name: Zebra on: workflow_dispatch: push: - branches: [ "zcash-ci" ] - # pull_request: - # branches: [ main ] + branches: [ "main" ] jobs: build-zebra: