Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release-1.2' into python/json.…
Browse files Browse the repository at this point in the history
…mget
  • Loading branch information
BoazBD committed Oct 23, 2024
2 parents ebe94a1 + ebf6460 commit 5afa929
Show file tree
Hide file tree
Showing 29 changed files with 999 additions and 309 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
paths:
- csharp/**
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- .github/workflows/csharp.yml
- .github/workflows/install-shared-dependencies/action.yml
- .github/workflows/test-benchmark/action.yml
Expand All @@ -20,7 +20,7 @@ on:
paths:
- csharp/**
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- .github/workflows/csharp.yml
- .github/workflows/install-shared-dependencies/action.yml
- .github/workflows/test-benchmark/action.yml
Expand Down Expand Up @@ -76,8 +76,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up dotnet ${{ matrix.dotnet }}
uses: actions/setup-dotnet@v4
Expand Down Expand Up @@ -122,8 +121,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- uses: ./.github/workflows/lint-rust
with:
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- v*
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- go/**
- .github/workflows/go.yml
- .github/workflows/install-shared-dependencies/action.yml
Expand All @@ -19,7 +19,7 @@ on:
pull_request:
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- go/**
- .github/workflows/go.yml
- .github/workflows/install-shared-dependencies/action.yml
Expand Down Expand Up @@ -73,8 +73,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up Go ${{ matrix.go }}
uses: actions/setup-go@v5
Expand Down Expand Up @@ -204,8 +203,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- uses: ./.github/workflows/lint-rust
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/install-redis/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ runs:
shell: bash

- uses: actions/checkout@v4
with:
submodules: recursive


- uses: actions/cache@v3
id: cache-redis
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/java-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ jobs:
echo "No cleaning needed"
fi
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up JDK
uses: actions/setup-java@v4
Expand Down Expand Up @@ -225,8 +224,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up JDK
uses: actions/setup-java@v4
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- v*
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- java/**
- .github/workflows/java.yml
- .github/workflows/install-shared-dependencies/action.yml
Expand All @@ -19,7 +19,7 @@ on:
pull_request:
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- java/**
- .github/workflows/java.yml
- .github/workflows/install-shared-dependencies/action.yml
Expand Down Expand Up @@ -74,8 +74,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- uses: gradle/actions/wrapper-validation@v3

Expand Down Expand Up @@ -191,8 +190,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- uses: ./.github/workflows/lint-rust
with:
Expand All @@ -210,8 +208,7 @@ jobs:
run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide

- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up JDK
uses: actions/setup-java@v4
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/lint-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ runs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Install Rust toolchain and protoc
uses: ./.github/workflows/install-rust-and-protoc
Expand All @@ -42,7 +41,7 @@ runs:

- run: |
cargo update
cargo install --locked --version 0.15.1 cargo-deny
cargo install --locked cargo-deny
cargo deny check --config ${GITHUB_WORKSPACE}/deny.toml
working-directory: ${{ inputs.cargo-toml-folder }}
shell: bash
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- v*
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- node/**
- utils/cluster_manager.py
- .github/workflows/node.yml
Expand All @@ -22,7 +22,7 @@ on:
pull_request:
paths:
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- node/**
- utils/cluster_manager.py
- .github/workflows/node.yml
Expand Down Expand Up @@ -67,8 +67,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Use Node.js 16.x
uses: actions/setup-node@v3
Expand Down Expand Up @@ -125,8 +124,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- uses: ./.github/workflows/lint-rust
with:
Expand Down Expand Up @@ -239,8 +237,7 @@ jobs:
apk add git
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Setup musl on Linux
uses: ./.github/workflows/setup-musl-on-linux
Expand Down Expand Up @@ -287,8 +284,7 @@ jobs:
run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide

- uses: actions/checkout@v4
with:
submodules: recursive


- name: Use Node.js 18.x
uses: actions/setup-node@v4
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
paths:
- python/**
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**/**
- utils/cluster_manager.py
- .github/workflows/python.yml
- .github/workflows/build-python-wrapper/action.yml
Expand All @@ -25,7 +25,7 @@ on:
paths:
- python/**
- glide-core/src/**
- submodules/**
- glide-core/redis-rs/redis/src/**
- utils/cluster_manager.py
- .github/workflows/python.yml
- .github/workflows/build-python-wrapper/action.yml
Expand Down Expand Up @@ -84,8 +84,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -167,8 +166,7 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -204,8 +202,7 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v4
with:
submodules: recursive


- name: lint rust
uses: ./.github/workflows/lint-rust
Expand Down Expand Up @@ -299,8 +296,6 @@ jobs:
run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide

- uses: actions/checkout@v4
with:
submodules: recursive

- name: Build Python wrapper
uses: ./.github/workflows/build-python-wrapper
Expand Down
Loading

0 comments on commit 5afa929

Please sign in to comment.