Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/EmbarkStudios/carg…
Browse files Browse the repository at this point in the history
…o-deny-action-2
  • Loading branch information
Slesarew authored Oct 24, 2024
2 parents 7a45e9f + 1689c34 commit 4caa7db
Show file tree
Hide file tree
Showing 45 changed files with 4,745 additions and 1,393 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust-cargo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/checkout@v4.2.0
uses: actions/checkout@v4.2.1
with:
fetch-depth: 50
submodules: 'recursive'
Expand All @@ -32,7 +32,7 @@ jobs:
override: true

- name: Rust Cache
uses: Swatinem/rust-cache@v2.7.3
uses: Swatinem/rust-cache@v2.7.5

- name: cargo build
run: cargo build --release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-cargo-deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout Sources
uses: actions/checkout@v4.2.0
uses: actions/checkout@v4.2.1

- name: Run cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/checkout@v4.2.0
uses: actions/checkout@v4.2.1
with:
fetch-depth: 50
submodules: 'recursive'
Expand All @@ -32,7 +32,7 @@ jobs:
override: true

- name: Rust Cache
uses: Swatinem/rust-cache@v2.7.3
uses: Swatinem/rust-cache@v2.7.5

- name: cargo clippy
run: cargo clippy --all-targets -- -D warnings -D clippy::pedantic -D clippy::correctness -D clippy::complexity -D clippy::perf
2 changes: 1 addition & 1 deletion .github/workflows/rust-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/checkout@v4.2.0
uses: actions/checkout@v4.2.1
with:
fetch-depth: 50
submodules: 'recursive'
Expand Down
83 changes: 60 additions & 23 deletions .github/workflows/rust-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rust test
name: Kalatori Tests

on:
pull_request:
Expand All @@ -9,36 +9,73 @@ on:

jobs:
check:
name: Cargo test
runs-on: ubuntu-latest
name: Cargo and TypeScript Tests
runs-on: ubuntu-latest
steps:

- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}
access_token: ${{ github.token }}

- name: Checkout sources
uses: actions/checkout@v4.2.0
- name: Checkout sources
uses: actions/checkout@v4.2.0
with:
fetch-depth: 50
submodules: 'recursive'
fetch-depth: 50
submodules: recursive

- name: Install Rust stable toolchain
uses: actions-rs/toolchain@v1.0.7
- name: Initialize Git Submodules
run: git submodule update --init --recursive

- name: Verify directory structure
run: ls -R

- name: Install Rust stable toolchain
uses: actions-rs/toolchain@v1.0.7
with:
profile: minimal
toolchain: stable
override: true
profile: minimal
toolchain: stable
override: true

- name: Install cargo-nextest
uses: baptiste0928/cargo-install@v3
- name: Install cargo-nextest
uses: baptiste0928/cargo-install@v3
with:
crate: cargo-nextest
version: 0.9
crate: cargo-nextest
version: 0.9

- name: Rust Cache
uses: Swatinem/rust-cache@v2.7.5

- name: Run Rust app in background with environment variables
run: |
export KALATORI_HOST="127.0.0.1:16726"
export KALATORI_SEED="bottom drive obey lake curtain smoke basket hold race lonely fit walk"
export KALATORI_RECIPIENT="5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
export KALATORI_REMARK="test"
cargo build
nohup cargo r &
- name: Wait for Rust app to start
run: sleep 120
# Wait for the Rust app to start and then wait for the app to connect to RPC

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: '20'

- name: Install Yarn package manager
run: npm install --global yarn

- name: Install dependencies
working-directory: ./tests/kalatori-api-test-suite
run: yarn install --network-timeout 100000

- name: Rust Cache
uses: Swatinem/rust-cache@v2.7.3
- name: Run tests
working-directory: ./tests/kalatori-api-test-suite
env:
DAEMON_HOST: 'http://127.0.0.1:16726'
run: yarn test

- name: cargo nextest
run: cargo nextest run
# - name: Run Rust tests
# run: cargo nextest run
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
target
tests/kalatori-api-test-suite/node_modules/
*.db
*.txt
kalatori.toml

# IDE

.vscode
.idea
.idea
21 changes: 18 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file.

## [0.2.4] - 2024-10-21

### ⚡ Performance

- Switched from the unmaintained `hex` crate to `const-hex`.

### 🚜 Refactor

- Moved all utility modules under the utils module.
- Removed all `mod.rs` files & added a lint rule to prevent them.

## [0.2.3] - 2024-10-15

### 🚀 Features

- Server health call implementation

## [0.2.2] - 2024-10-10

### 🚀 Features
Expand All @@ -15,7 +32,7 @@ All notable changes to this project will be documented in this file.

## [0.2.1] - 2024-10-07

Making the order request work according to specs in the [specs](https://alzymologist.github.io/kalatori-api/#/).
Making the order request work according to specs in the [specs](https://alzymologist.github.io/kalatori-api/#/).
Using the tests from [kalatori-api-test-suite]() in order to validate.
Added git cliff and configuration for it to generate CHANGELOG like this one, see [CONTRIBUTING.md](CONTRIBUTING.md)

Expand All @@ -31,5 +48,3 @@ Added git cliff and configuration for it to generate CHANGELOG like this one, se
### ⚙️ Miscellaneous Tasks

- Resolve conflicts


Loading

0 comments on commit 4caa7db

Please sign in to comment.