Skip to content

Commit 5299193

Browse files
committed
Merge branch 'aip-61-adex-v5' into api-routes-documentation
2 parents d72ec92 + d5cfc8c commit 5299193

File tree

109 files changed

+2261
-1085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+2261
-1085
lines changed

.github/workflows/ci.yml

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,78 @@
11
on: [push, pull_request]
22

3+
# Stops the running workflow of previous pushes
4+
concurrency:
5+
group: ${{ github.ref }}
6+
cancel-in-progress: true
7+
38
name: Continuous Integration
49

510
jobs:
6-
ci-flow:
7-
name: cargo make ci-flow - Tests, clippy & rustfmt
11+
lint-rustfmt:
12+
name: Running lint - rustfmt
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
with:
17+
submodules: true
18+
- uses: actions-rs/toolchain@v1
19+
with:
20+
# No need to add `toolchain`, it will use `rust-toolchain` file instead
21+
profile: minimal
22+
components: rustfmt
23+
- uses: davidB/rust-cargo-make@v1
24+
- name: Rustfmt
25+
# we don't use the check-format-ci-flow because it requires nightly (cargo-make)
26+
run: cargo make check-format-flow
27+
lint-clippy:
28+
name: Running lint - clippy
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v3
32+
with:
33+
submodules: true
34+
- uses: actions-rs/toolchain@v1
35+
with:
36+
# No need to add `toolchain`, it will use `rust-toolchain` file instead
37+
profile: minimal
38+
components: clippy
39+
- uses: davidB/rust-cargo-make@v1
40+
- name: Run Clippy
41+
# we don't use the clippy-ci-flow because it requires nightly (cargo-make)
42+
run: cargo make clippy-flow
43+
check-docs:
44+
name: Rustdoc build check
45+
runs-on: ubuntu-latest
46+
steps:
47+
- uses: actions/checkout@v3
48+
with:
49+
submodules: true
50+
- uses: actions-rs/toolchain@v1
51+
with:
52+
# No need to add `toolchain`, it will use `rust-toolchain` file instead
53+
profile: minimal
54+
components: rust-docs
55+
- name: Build docs with no features
56+
run: RUSTDOCFLAGS="-D warnings" cargo doc --workspace --no-deps --no-default-features
57+
- name: Build docs with --all-features
58+
run: RUSTDOCFLAGS="-D warnings" cargo doc --workspace --no-deps --all-features
59+
test-flow:
60+
name: cargo make ci-flow - Tests
861
runs-on: ubuntu-latest
962
steps:
10-
- uses: actions/checkout@v2
63+
- uses: actions/checkout@v3
1164
with:
1265
submodules: true
1366
# Runs all services needed for testing
1467
- name: run docker-compose
1568
uses: sudo-bot/action-docker-compose@latest
1669
with:
1770
# https://docs.docker.com/compose/reference/overview/
18-
cli-args: "-f docker-compose.harness.yml up -d --build"
71+
cli-args: "-f docker-compose.harness.yml up -d --build adex-postgres adex-redis ganache-1 ganache-1337"
1972
- uses: actions-rs/toolchain@v1
2073
with:
2174
# No need to add `toolchain`, it will use `rust-toolchain` file instead
22-
profile: default
23-
override: true
24-
components: clippy, rustfmt
75+
profile: minimal
2576
- uses: davidB/rust-cargo-make@v1
2677
- name: Run `cargo make ci-flow`
2778
# Running cargo make doesn't successfully start `ganache`

.github/workflows/docs.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ jobs:
1010
name: Deploy docs on gh-pages
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
submodules: true
16+
- uses: actions-rs/toolchain@v1
17+
with:
18+
# Use nightly to build the docs with `--cfg docsrs`
19+
toolchain: nightly
20+
profile: minimal
21+
components: rust-docs
1622
- name: Build docs
17-
run: cargo doc --no-deps
23+
run: RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features --no-deps --workspace
1824
- name: Prepare /docs & index file
1925
run: |
2026
rm -rf ./docs

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: startsWith(github.event.ref, 'refs/tags/validator-v')
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
submodules: true
1616
# See https://github.community/t/how-to-get-just-the-tag-name/16241/10

0 commit comments

Comments
 (0)