Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
HermanObst committed Jan 22, 2025
2 parents 1c24712 + 88ed67c commit d144093
Show file tree
Hide file tree
Showing 30 changed files with 2,162 additions and 692 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/db-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:
workflow_call:

jobs:
db-check:
runs-on: ubuntu-latest
steps:
- run: echo "Checking DB Version"

update-db-version:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'db-migration')
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ jobs:
toml-lint:
runs-on: ubuntu-latest
steps:
- name: Download taplo
run: |
curl -L https://github.com/tamasfe/taplo/releases/download/0.9.3/taplo-linux-x86_64.gz -o taplo.gz
gunzip taplo.gz
chmod +x taplo
mv taplo /usr/local/bin/taplo
- name: Checkout toml files
uses: actions/checkout@v4
- name: Run toml check
run: npx @taplo/[email protected] fmt --config ./taplo/taplo.toml --check
run: taplo fmt --config ./taplo/taplo.toml --check
3 changes: 0 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
linters:
name: Run linters
needs: update_db_version
if: ${{ github.event.pull_request.draft == false && always() }}
uses: ./.github/workflows/linters.yml

rust_check:
Expand All @@ -39,14 +38,12 @@ jobs:
coverage:
name: Run Coverage
needs: update_db_version
if: ${{ github.event.pull_request.draft == false && always() }}
secrets: inherit
uses: ./.github/workflows/coverage.yml

build:
name: Build Madara
needs: update_db_version
if: ${{ github.event.pull_request.draft == false && always() }}
uses: ./.github/workflows/build.yml

js_test:
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Here is a list of all the supported methods with their current status:
| ------ | ------------------------------------------------ |
|| `starknet_unsubscribe` (v0.8.0) |
|| `starknet_subscribeNewHeads` (v0.8.0) |
| | `starknet_subscribeEvents` (v0.8.0) |
| | `starknet_subscribeEvents` (v0.8.0) |
|| `starknet_subscribeTransactionStatus` (v0.8.0) |
|| `starknet_subscribePendingTransactions` (v0.8.0) |
|| `starknet_subscriptionReorg` (v0.8.0) |
Expand Down
Loading

0 comments on commit d144093

Please sign in to comment.