Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce osmosis workspace #707

Merged
merged 2 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
uses: dtolnay/rust-toolchain@stable
- name: Rust check
run: cargo check
working-directory: smart-contracts
working-directory: smart-contracts/osmosis
- name: Store dependencies
uses: actions/cache/save@v4
with:
path: |
~/.cargo
~/go
**/target
key: ${{ runner.os }}-cargo-$GITHUB_SHA
smart-contracts/osmosis/**/target
key: ${{ runner.os }}-cargo-osmosis-$GITHUB_SHA
restore-keys: ${{ runner.os }}-cargo
30 changes: 0 additions & 30 deletions .github/workflows/cl_vault.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/cl_vault_osmosis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CL Vault (osmosis)

on:
pull_request:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/cl-vault/Cargo.toml'
- 'smart-contracts/osmosis/contracts/cl-vault/**.rs'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/cl_vault_osmosis.yml'
- '.github/workflows/rust_basic.yml'
push:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/cl-vault/Cargo.toml'
- 'smart-contracts/osmosis/contracts/cl-vault/**.rs'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/cl_vault_osmosis.yml'
- '.github/workflows/rust_basic.yml'
workflow_dispatch:

jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'osmosis/contracts/cl-vault'
16 changes: 9 additions & 7 deletions .github/workflows/dex_router_osmosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ on:
branches:
- main
paths:
- 'smart-contracts/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/**.yml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/dex_router_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/**.yml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/dex-router-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/dex_router_osmosis.yml'
workflow_dispatch:

jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'contracts/dex-router-osmosis'
target: 'osmosis/contracts/dex-router-osmosis'
10 changes: 5 additions & 5 deletions .github/workflows/lst_adapter_osmosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on:
branches:
- main
paths:
- 'smart-contracts/contracts/lst-adapter-osmosis/Cargo.toml'
- 'smart-contracts/contracts/lst-adapter-osmosis/**.rs'
- 'smart-contracts/osmosis/contracts/lst-adapter-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/lst-adapter-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/lst_adapter_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/contracts/lst-adapter-osmosis/Cargo.toml'
- 'smart-contracts/contracts/lst-adapter-osmosis/**.rs'
- 'smart-contracts/osmosis/contracts/lst-adapter-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/lst-adapter-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/lst_adapter_osmosis.yml'
workflow_dispatch:
Expand All @@ -23,4 +23,4 @@ jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'contracts/lst-adapter-osmosis'
target: 'osmosis/contracts/lst-adapter-osmosis'
10 changes: 5 additions & 5 deletions .github/workflows/lst_dex_adapter_osmosis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on:
branches:
- main
paths:
- 'smart-contracts/contracts/lst-dex-adapter-osmosis/Cargo.toml'
- 'smart-contracts/contracts/lst-dex-adapter-osmosis/**.rs'
- 'smart-contracts/osmosis/contracts/lst-dex-adapter-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/lst-dex-adapter-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/lst_dex_adapter_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/contracts/lst-dex-adapter-osmosis/Cargo.toml'
- 'smart-contracts/contracts/lst-dex-adapter-osmosis/**.rs'
- 'smart-contracts/osmosis/contracts/lst-dex-adapter-osmosis/Cargo.toml'
- 'smart-contracts/osmosis/contracts/lst-dex-adapter-osmosis/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/lst_dex_adapter_osmosis.yml'
workflow_dispatch:
Expand All @@ -23,4 +23,4 @@ jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'contracts/lst-dex-adapter-osmosis'
target: 'osmosis/contracts/lst-dex-adapter-osmosis'
28 changes: 0 additions & 28 deletions .github/workflows/merkle_incentives.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/merkle_incentives_osmosis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Merkle Incentives (osmosis)

on:
pull_request:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/merkle-incentives/Cargo.toml'
- 'smart-contracts/osmosis/contracts/merkle-incentives/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/merkle_incentives_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/merkle-incentives/Cargo.toml'
- 'smart-contracts/osmosis/contracts/merkle-incentives/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/merkle_incentives_osmosis.yml'
workflow_dispatch:

jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'osmosis/contracts/merkle-incentives'
22 changes: 0 additions & 22 deletions .github/workflows/quasar_types.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/quasar_types_osmosis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Quasar Types (osmosis)

on:
pull_request:
branches:
- main
paths:
- 'smart-contracts/osmosis/packages/quasar-types/Cargo.toml'
- 'smart-contracts/osmosis/packages/quasar-types/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/quasar_types_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/osmosis/packages/quasar-types/Cargo.toml'
- 'smart-contracts/osmosis/packages/quasar-types/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/quasar_types_osmosis.yml'
workflow_dispatch:

jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'osmosis/packages/quasar-types'
26 changes: 0 additions & 26 deletions .github/workflows/range_middleware.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/range_middleware_osmosis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Range Middleware (osmosis)

on:
pull_request:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/range-middleware/Cargo.toml'
- 'smart-contracts/osmosis/contracts/range-middleware/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/range_middleware_osmosis.yml'
push:
branches:
- main
paths:
- 'smart-contracts/osmosis/contracts/range-middleware/Cargo.toml'
- 'smart-contracts/osmosis/contracts/range-middleware/**.rs'
- '.github/workflows/rust_basic.yml'
- '.github/workflows/range_middleware_osmosis.yml'
workflow_dispatch:

jobs:
unit-test:
uses: ./.github/workflows/rust_basic.yml
with:
target: 'osmosis/contracts/range-middleware'
6 changes: 3 additions & 3 deletions .github/workflows/rust_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
path: |
~/.cargo
~/go
**/target
key: ${{ runner.os }}-cargo-$GITHUB_SHA
restore-keys: ${{ runner.os }}-cargo
smart-contracts/osmosis/**/target
key: ${{ runner.os }}-cargo-osmosis-$GITHUB_SHA
restore-keys: ${{ runner.os }}-cargo-osmosis
- name: Rust lint
run: RUSTFLAGS="-Dwarnings" cargo clippy --workspace -- -D warnings --A deprecated
working-directory: smart-contracts/${{ inputs.target }}
Expand Down
Loading
Loading