From bc0836d236351691950487a873ae39150fe9ac20 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Fri, 20 Sep 2024 19:31:19 -0700 Subject: [PATCH] go Signed-off-by: Yury-Fridlyand --- .github/workflows/csharp.yml | 34 +++++++++++++++++----------------- .github/workflows/go.yml | 2 +- go/Makefile | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index ebf03479577..7a33f165a9c 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -194,20 +194,20 @@ jobs: benchmarks/results/* utils/clusters/** -# lint: -# timeout-minutes: 10 -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# with: -# submodules: recursive -# -# - name: lint rust -# uses: ./.github/workflows/lint-rust -# with: -# cargo-toml-folder: csharp/lib -# github-token: ${{ secrets.GITHUB_TOKEN }} -# -# - name: Format -# working-directory: csharp -# run: dotnet format --verify-no-changes --verbosity diagnostic + lint: + timeout-minutes: 10 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: lint rust + uses: ./.github/workflows/lint-rust + with: + cargo-toml-folder: csharp/lib + github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Format + working-directory: csharp + run: dotnet format --verify-no-changes --verbosity diagnostic diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c4dc33911a1..94ad480b36c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -164,7 +164,7 @@ jobs: run: | sudo apt install golang-goprotobuf-dev echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/go/target/release/deps/" >> $GITHUB_ENV - make install-dev-tools install-build-tools generate-protobuf lint-ci + make install-dev-tools install-build-tools generate-protobuf generate-bindings lint-ci # build-amazonlinux-latest: # if: github.repository_owner == 'valkey-io' diff --git a/go/Makefile b/go/Makefile index b15d1987711..6938f225964 100644 --- a/go/Makefile +++ b/go/Makefile @@ -39,13 +39,13 @@ clean: rm -f lib.h rm -f benchmarks/benchmarks - -build-glide-client: +build-glide-client: generate-bindings cargo build --release - cbindgen --config cbindgen.toml --crate glide-rs --output lib.h -build-glide-client-debug: +build-glide-client-debug: generate-bindings cargo build + +generate-bindings: cbindgen --config cbindgen.toml --crate glide-rs --output lib.h generate-protobuf: