Skip to content

Commit

Permalink
Merge branch 'development' into validator-node-merge-development
Browse files Browse the repository at this point in the history
* development: (31 commits)
  feat!: revalidate all outputs (tari-project#3471)
  fix: check SAF message inflight and check stored_at is in past (tari-project#3444)
  feat!: apps should not depend on other app configs (tari-project#3469)
  fix: fix recovery test reporting message (tari-project#3479)
  chore: improve cucumber tests to wait for broadcast (tari-project#3461)
  test: use TCP node for daily sync test (tari-project#3464)
  fix: remove unbounded vec allocations from base node grpc/p2p messaging (tari-project#3467)
  fix: upgrade rustyline dependencies (tari-project#3476)
  fix(dht): discard encrypted message with no destination (tari-project#3472)
  fix: remove consensus breaking change in transaction input (tari-project#3474)
  feat: tx weight takes tariscript and output features into account [igor] (tari-project#3411)
  fix: validate dht header before dedup cache (tari-project#3468)
  fix: sha256sum isn't available on all *nix platforms (tari-project#3466)
  fix: typo in console wallet (tari-project#3465)
  fix: ensure that accumulated orphan chain data is committed before header validation (tari-project#3462)
  fix: remove is_synced check for transaction validation (tari-project#3459)
  feat: improve logging for tari_mining_node (tari-project#3449)
  fix: remove unnecessary wallet dependency (tari-project#3438)
  test: simplify cucumber tests (tari-project#3457)
  ci: create script to update DNS records from hashes.txt (tari-project#3458)
  ...
  • Loading branch information
sdbondi committed Oct 25, 2021
2 parents a75ec1d + 9bd4760 commit 9d80b31
Show file tree
Hide file tree
Showing 279 changed files with 12,090 additions and 8,180 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ commands:
- run:
name: Run cucumber scenarios
no_output_timeout: 20m
command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --tags "not @long-running and not @broken and not @wallet-ffi" --format json:cucumber_output/tests.cucumber --exit --retry 2 --retryTagFilter "@flaky and not @broken"
command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --profile "ci" --tags "not @long-running and not @broken and not @wallet-ffi" --format json:cucumber_output/tests.cucumber --exit --retry 2 --retryTagFilter "@flaky and not @broken"
- run:
name: Generate report
command: cd integration_tests && node ./generate_report.js
when: always
# Below step requires NodeJS v12 to run correctly, see explanation in WalletFFI.feature
- run:
name: Run FFI wallet library cucumber scenarios
command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --tags "not @long-running and not @broken and not @flaky and @wallet-ffi" --format json:cucumber_output/tests_ffi.cucumber --exit
command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --profile "ci" --tags "not @long-running and not @broken and not @flaky and @wallet-ffi" --format json:cucumber_output/tests_ffi.cucumber --exit
when: always
- run:
name: Generate report (ffi)
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
on:
push:
branches:
- development

name: Version

jobs:
bump:
name: patch crate versions
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v2
- name: gpg
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.TARI_DEPLOY_SECRET_KEY }}
git_user_signingkey: true
git_commit_gpgsign: true
git_push_gpgsign: false
- name: install
run: |
echo "This is a lot faster than building from source ⚡"
curl -o /tmp/cargo-workspaces -L https://github.com/tari-project/cargo-workspaces/releases/download/v0.2.24/cargo-workspaces-v0.2.24-x86_64-linux-gnu
HASH=$(shasum /tmp/cargo-workspaces)
EXPECTED="94901503e751564153392c8f93bfebdc349e650c /tmp/cargo-workspaces"
if [ "$HASH" != "$EXPECTED" ]; then
echo "Well, this is awkward.";
echo "The hash of the downloaded binary doesn't match what's expected.";
echo "Either the binary has been innocently changed without updating the expected hash,"
echo "or it's compromised and you're under attack!"
echo "Bailing out."
exit 1
fi
chmod +x /tmp/cargo-workspaces
- name: git config
run: |
git config --global user.name "tari-deploy"
git config --global user.email "bug_reports@tari.com"
- name: crates list
run: |
pwd
/tmp/cargo-workspaces workspaces list
- name: bump patch version
run: |
/tmp/cargo-workspaces workspaces version patch \
--no-git-tag \
--sign-commit \
--no-global-tag \
--force "*" \
-y \
-m "ci: bump crate versions to %v [skip ci]" \
--allow-branch development
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ node_modules
/integration_tests/temp
/applications/utils/temp/
/integration_tests/cucumber_output

# ignore output files from windows ISS
buildtools/Output/
Loading

0 comments on commit 9d80b31

Please sign in to comment.