Skip to content

Commit

Permalink
restructure
Browse files Browse the repository at this point in the history
ok separated config now

wip

wip

wip

ok ok

ok it's working again

ok getting there

ok

bring back plugins

fix graphiql

fix graphiql again

fix tracing

ok ok ok

fix clippy, fmt, over-http and ci

fix benches
fix deps

fix docker image

fix
  • Loading branch information
dotansimha committed Nov 16, 2023
1 parent e08399d commit 85038cd
Show file tree
Hide file tree
Showing 64 changed files with 2,044 additions and 2,782 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
include:
- { rust: 1.72.1, os: ubuntu-22.04 }
- { rust: 1.74.0, os: ubuntu-22.04 }
- { rust: 1.73.0, os: ubuntu-22.04 }
steps:
- name: checkout
Expand All @@ -36,9 +36,6 @@ jobs:
- name: test
run: cargo test

- name: clean
run: cargo clean

graphql-over-http:
runs-on: ubuntu-22.04
steps:
Expand All @@ -47,7 +44,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: 1.73.0
toolchain: 1.74.0
override: true

- name: Install Node
Expand All @@ -64,7 +61,7 @@ jobs:

- uses: JarvusInnovations/background-action@v1
with:
run: cargo run -- tests/graphql-over-http/config.yaml
run: cargo run --bin conductor -- tests/graphql-over-http/config.yaml
wait-on: http-get://127.0.0.1:9000/graphql
tail: true
wait-for: 5m
Expand All @@ -85,15 +82,15 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.73.0
toolchain: 1.74.0
components: rustfmt, clippy
override: true

- name: generate config json schema
run: cargo test --test generate-config-schema
run: cargo run --bin generate-config-schema

- name: check diff
run: git diff --exit-code ./src/config/conductor.schema.json
run: git diff --exit-code ./crates/config/conductor.schema.json

lint:
runs-on: ubuntu-22.04
Expand All @@ -103,7 +100,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.73.0
toolchain: 1.74.0
components: rustfmt, clippy
override: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
workdir: .
provenance: false
push: true
files: docker/bake.hcl
files: ./crates/conductor/docker/bake.hcl
targets: build
set: |
*.cache-from=type=gha,scope=build
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
command: build
target: ${{ matrix.platform.target }}
args: "--locked --release"
strip: true
strip: false

- uses: actions/upload-artifact@v3
if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"yaml.schemas": {
"./src/config/conductor.schema.json": "*.yaml"
"./crates/config/conductor.schema.json": "*.yaml"
},
"rust-analyzer.linkedProjects": ["./Cargo.toml"]
}
Loading

0 comments on commit 85038cd

Please sign in to comment.