Skip to content

Commit 5f0a3fc

Browse files
Merge branch 'main' of https://github.com/valkey-io/valkey-glide into yarn-fix
2 parents b808143 + 94a872b commit 5f0a3fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+9028
-2686
lines changed

.github/workflows/ort.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
repository: "oss-review-toolkit/ort"
7676
path: "./ort"
77-
ref: "44.0.0"
77+
ref: "26.0.0"
7878
submodules: recursive
7979

8080
- name: Install Rust toolchain
@@ -158,6 +158,17 @@ jobs:
158158
distribution: "temurin"
159159
java-version: 11
160160

161+
- name: Install protoc (protobuf)
162+
uses: arduino/setup-protoc@v3
163+
with:
164+
version: "29.1"
165+
repo-token: ${{ secrets.GITHUB_TOKEN }}
166+
167+
- name: Build java artifact
168+
working-directory: ./java
169+
run: |
170+
./gradlew publishToMavenLocal -x buildRust -x javadoc
171+
161172
- name: Run ORT tools for Java
162173
uses: ./.github/workflows/run-ort-tools
163174
with:

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
* Go: Add `ZCARD` ([#2838](https://github.com/valkey-io/valkey-glide/pull/2838))
1818
* Java, Node, Python: Update documentation for CONFIG SET and CONFIG GET ([#2919](https://github.com/valkey-io/valkey-glide/pull/2919))
1919
* Go: Add `BZPopMin` ([#2849](https://github.com/valkey-io/valkey-glide/pull/2849))
20+
* Java: Shadow `protobuf` dependency ([#2931](https://github.com/valkey-io/valkey-glide/pull/2931))
21+
* Java: Add `RESP2` support ([#2383](https://github.com/valkey-io/valkey-glide/pull/2383))
22+
* Node, Python: Add `IFEQ` option ([#2909](https://github.com/valkey-io/valkey-glide/pull/2909), [#2962](https://github.com/valkey-io/valkey-glide/pull/2962))
2023

2124
#### Breaking Changes
2225

go/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ unit-test:
8282
mkdir -p reports
8383
set -o pipefail; \
8484
LD_LIBRARY_PATH=$(shell find . -name libglide_rs.so|grep -w release|tail -1|xargs dirname|xargs readlink -f):${LD_LIBRARY_PATH} \
85-
go test -v -race ./... -skip TestGlideTestSuite $(if $(test-filter), -run $(test-filter)) \
85+
go test -v -race ./... -skip TestGlideTestSuite $(if $(test-filter), -testify.m $(test-filter)) \
8686
| tee >(go tool test2json -t -p github.com/valkey-io/valkey-glide/go/glide/utils | go-test-report -o reports/unit-tests.html -t unit-test > /dev/null)
8787

8888
# integration tests - run subtask with skipping modules tests
89-
integ-test: export TEST_FILTER = -skip TestGlideTestSuite/TestModule $(if $(test-filter), -run $(test-filter))
89+
integ-test: export TEST_FILTER = -skip TestGlideTestSuite/TestModule $(if $(test-filter), -testify.m $(test-filter))
9090
integ-test: __it
9191

9292
# modules tests - run substask with default filter
93-
modules-test: export TEST_FILTER = $(if $(test-filter), -run $(test-filter), -run TestGlideTestSuite/TestModule)
93+
modules-test: export TEST_FILTER = $(if $(test-filter), -run $(test-filter), -testify.m TestGlideTestSuite/TestModule)
9494
modules-test: __it
9595

9696
__it:

0 commit comments

Comments
 (0)