Skip to content

Commit

Permalink
Merge pull request #5051 from tari-project/feature-cucumber-rs
Browse files Browse the repository at this point in the history
Description
---
This is a Base feature branch that all additional work on the implementation will be merged into, before being merged into development.

Motivation and Context
---
Removing the JS dependencies in favor of a pure rust implementation

Related
---
Toolchain upgrade:
tari-labs/docker#23
tari-project/action-buildlibs#10

How Has This Been Tested?
---
CI

Closes: #5050
  • Loading branch information
stringhandler committed Jan 21, 2023
2 parents d4fe7de + 21272d3 commit 5f7f04b
Show file tree
Hide file tree
Showing 265 changed files with 13,882 additions and 23,070 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "linux-x86_64",
"runs-on": "ubuntu-20.04",
"rust": "nightly-2022-05-01",
"rust": "nightly-2022-11-03",
"target": "x86_64-unknown-linux-gnu",
"cross": false,
"target_cpu": "x86-64",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:
env:
TBN_FILENAME: "tari_suite"
TBN_BUNDLEID_BASE: "com.tarilabs.pkg"
toolchain: nightly-2022-05-01
toolchain: nightly-2022-11-03
matrix-json-file: ".github/workflows/base_node_binaries.json"
CARGO_HTTP_MULTIPLEXING: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dockers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ name: Build docker images
- xmrig

env:
toolchain_default: nightly-2022-05-01
toolchain_default: nightly-2022-11-03

jobs:
builds_envs_setup:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_dockers_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
toolchain:
type: string
description: 'Rust toolchain'
default: nightly-2022-05-01
default: nightly-2022-11-03
arch:
type: string
default: x86-64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_libwallets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ name: Build libwallets
description: 'Rust toolchain'

env:
toolchain_default: nightly-2022-05-01
toolchain_default: nightly-2022-11-03

jobs:
builds_envs_setup:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_libwallets_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: Build libwallet - workflow_call/on-demand
toolchain:
type: string
description: 'Rust toolchain'
default: 'nightly-2022-05-01'
default: 'nightly-2022-11-03'

jobs:
android_build:
Expand Down
25 changes: 12 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: CI

'on':
"on":
workflow_dispatch:
push:
branches:
Expand All @@ -15,7 +15,7 @@ name: CI
- synchronize

env:
toolchain: nightly-2022-05-01
toolchain: nightly-2022-11-03
CARGO_HTTP_MULTIPLEXING: false
CARGO_TERM_COLOR: always
PROTOC: protoc
Expand All @@ -25,7 +25,7 @@ jobs:
clippy:
name: clippy
#runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
runs-on: [ ubuntu-20.04 ]
runs-on: [ubuntu-20.04]
steps:
- name: checkout
uses: actions/checkout@v3
Expand All @@ -34,7 +34,6 @@ jobs:
with:
toolchain: ${{ env.toolchain }}
components: clippy, rustfmt
override: true
- name: ubuntu dependencies
run: |
sudo apt-get update
Expand All @@ -55,8 +54,8 @@ jobs:
command: lints
args: clippy --all-targets --all-features
build:
name: check nightly
runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
name: cargo check
runs-on: [self-hosted, ubuntu18.04-high-cpu]
steps:
- name: checkout
uses: actions/checkout@v3
Expand All @@ -81,8 +80,8 @@ jobs:
command: check
args: --release --package tari_wallet_ffi
build-stable:
name: check stable
runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
name: cargo check stable
runs-on: [self-hosted, ubuntu18.04-high-cpu]
steps:
- name: checkout
uses: actions/checkout@v3
Expand All @@ -104,15 +103,15 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: check
args: --release --all-targets --locked
args: --release --all-targets --workspace --exclude tari_integration_tests --locked
- name: cargo check ffi separately
uses: actions-rs/cargo@v1
with:
command: check
args: --release --package tari_wallet_ffi
licenses:
name: file licenses
runs-on: [ ubuntu-20.04 ]
runs-on: [ubuntu-20.04]
steps:
- name: checkout
uses: actions/checkout@v3
Expand All @@ -125,7 +124,7 @@ jobs:
run: ./scripts/file_license_check.sh
test:
name: test
runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
runs-on: [self-hosted, ubuntu18.04-high-cpu]
steps:
- name: checkout
uses: actions/checkout@v3
Expand All @@ -152,12 +151,12 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: -v --all-features --release
args: -v --all-features --release --workspace --exclude tari_integration_tests

# Allows other workflows to know the PR number
artifacts:
name: pr_2_artifact
runs-on: [ ubuntu-20.04 ]
runs-on: [ubuntu-20.04]
steps:
- name: Save the PR number in an artifact
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Source Coverage
- ci-coverage-*

env:
toolchain: nightly-2022-05-01
toolchain: nightly-2022-11-03

jobs:
coverage:
Expand Down
Loading

0 comments on commit 5f7f04b

Please sign in to comment.