Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Andrew Carbonetto <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
  • Loading branch information
Yury-Fridlyand and acarbonetto authored Nov 21, 2024
1 parent 2ea633d commit 7795c23
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/java-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "28.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Create secret key ring file
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "28.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Start standalone Valkey server
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "28.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build java client
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "28.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build java wrapper
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ jobs:
echo "Running on unsupported architecture: $ARCH. Expected one of: ['x86_64', 'aarch64']"
exit 1
fi
curl -LO $PB_REL/download/v4.25.5/protoc-4.25.5-linux-${PROTOC_ARCH}.zip
unzip protoc-4.25.5-linux-${PROTOC_ARCH}.zip -d $HOME/.local
curl -LO $PB_REL/download/v3.25.5/protoc-3.25.5-linux-${PROTOC_ARCH}.zip
unzip protoc-3.25.5-linux-${PROTOC_ARCH}.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
- name: Build Python wheels (macos)
Expand Down
10 changes: 5 additions & 5 deletions java/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The Valkey GLIDE Java wrapper consists of both Java and Rust code. Rust bindings
- git
- GCC
- pkg-config
- protoc (protobuf compiler) >= 28.1
- protoc (protobuf compiler) >= 28.2
- openssl
- openssl-dev
- rustup
Expand Down Expand Up @@ -64,17 +64,17 @@ Continue with **Install protobuf compiler** below.
To install protobuf for MacOS, run:
```bash
brew install protobuf
# Check that the protobuf compiler version 28.1 or higher is installed
# Check that the protobuf compiler version 28.2 or higher is installed
protoc --version
```

For the remaining systems, do the following:
```bash
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v28.1/protoc-28.1-linux-x86_64.zip
unzip protoc-28.1-linux-x86_64.zip -d $HOME/.local
curl -LO $PB_REL/download/v28.2/protoc-28.2-linux-x86_64.zip
unzip protoc-28.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
# Check that the protobuf compiler version 28.1 or higher is installed
# Check that the protobuf compiler version 28.2 or higher is installed
protoc --version
```

Expand Down
2 changes: 1 addition & 1 deletion java/client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repositories {
}

dependencies {
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.28.1'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.28.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'

implementation group: 'io.netty', name: 'netty-handler', version: '4.1.100.Final'
Expand Down
12 changes: 6 additions & 6 deletions python/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Before building the package from source, make sure that you have installed the l
- git
- GCC
- pkg-config
- protoc (protobuf compiler) >= v4.25.5
- protoc (protobuf compiler) >= v3.25.5
- openssl
- openssl-dev
- rustup
Expand All @@ -35,9 +35,9 @@ rustc --version
# Install protobuf compiler
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
# For other arch type from x86 example below, the signature of the curl url should be protoc-<version>-<os>-<arch>.zip,
# e.g. protoc-4.25.5-linux-aarch_64.zip for ARM64.
curl -LO $PB_REL/download/v4.25.5/protoc-4.25.5-linux-x86_64.zip
unzip protoc-4.25.5-linux-x86_64.zip -d $HOME/.local
# e.g. protoc-3.25.5-linux-aarch_64.zip for ARM64.
curl -LO $PB_REL/download/v3.25.5/protoc-3.25.5-linux-x86_64.zip
unzip protoc-3.25.5-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
# Check that the protobuf compiler is installed
protoc --version
Expand All @@ -59,8 +59,8 @@ source "$HOME/.cargo/env"
rustc --version
# Install protobuf compiler
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v4.25.5/protoc-4.25.5-linux-x86_64.zip
unzip protoc-4.25.5-linux-x86_64.zip -d $HOME/.local
curl -LO $PB_REL/download/v3.25.5/protoc-3.25.5-linux-x86_64.zip
unzip protoc-3.25.5-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
# Check that the protobuf compiler is installed
protoc --version
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
async-timeout==4.0.2;python_version<"3.11"
maturin==0.13.0
protobuf==4.25.*
protobuf==3.25.*
pytest
pytest-asyncio
typing_extensions==4.8.0;python_version<"3.11"
Expand Down

0 comments on commit 7795c23

Please sign in to comment.