Merge remote-tracking branch 'upstream/main' into csharp/integ_yuryf_…

…fix_eol Signed-off-by: Yury-Fridlyand <[email protected]>
valkey-io · Mar 6, 2024 · 527b4c6 · 527b4c6
2 parents 645457c + 94e1186
commit 527b4c6
Show file tree

Hide file tree

Showing 116 changed files with 7,552 additions and 1,175 deletions.
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -5,68 +5,91 @@ on:
         branches: ["main"]
         paths:
             - csharp/**
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
             - .github/workflows/csharp.yml
+            - .github/workflows/install-shared-dependencies/action.yml
+            - .github/workflows/install-redis/action.yml
+            - .github/workflows/test-benchmark/action.yml
+            - .github/workflows/lint-rust/action.yml
     pull_request:
         paths:
             - csharp/**
             - glide-core/src/**
             - submodules/**
             - .github/workflows/csharp.yml
+            - .github/workflows/install-shared-dependencies/action.yml
+            - .github/workflows/install-redis/action.yml
+            - .github/workflows/test-benchmark/action.yml
+            - .github/workflows/lint-rust/action.yml
 
 permissions:
     contents: read
 
 jobs:
     run-tests:
         timeout-minutes: 15
-        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
                 redis:
                     - 6.2.14
                     - 7.2.3
                 dotnet:
-                    - 6.0
-                    - 8.0
+                    - '6.0'
+                    - '8.0'
+                os:
+                    - ubuntu-latest
+                    - macos-latest
+        runs-on: ${{ matrix.os }}
 
         steps:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
 
             - name: Install redis
+              # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781
+              if: ${{ matrix.os == 'ubuntu-latest' }}
               uses: ./.github/workflows/install-redis
               with:
                   redis-version: ${{ matrix.redis }}
 
-            - name: Install protoc (protobuf)
-              uses: arduino/[email protected]
+            - name: Install shared software dependencies
+              uses: ./.github/workflows/install-shared-dependencies
               with:
-                  version: "25.1"
+                  os: ${{ matrix.os }}
+                  target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Set up dotnet ${{ matrix.dotnet }}
-              uses: actions/setup-dotnet@v3
+              uses: actions/setup-dotnet@v4
               with:
                   dotnet-version: ${{ matrix.dotnet }}
 
-            - name: Start redis server
-              run: redis-server &
-
             - name: Format
               working-directory: ./csharp
               run: dotnet format --verify-no-changes --verbosity diagnostic
 
             - name: Test dotnet ${{ matrix.dotnet }}
               working-directory: ./csharp
-              run: dotnet test --framework net${{ matrix.dotnet }} /warnaserror
+              run: dotnet test --framework net${{ matrix.dotnet }} "-l:html;LogFileName=TestReport.html" --results-directory . -warnaserror
 
             - uses: ./.github/workflows/test-benchmark
               with:
                   language-flag: -csharp
 
+            - name: Upload test reports
+              if: always()
+              continue-on-error: true
+              uses: actions/upload-artifact@v4
+              with:
+                  name: test-reports-dotnet-${{ matrix.dotnet }}-redis-${{ matrix.redis }}-${{ matrix.os }}
+                  path: |
+                      csharp/TestReport.html
+                      benchmarks/results/*
+                      utils/clusters/**
+
     lint-rust:
         timeout-minutes: 10
         runs-on: ubuntu-latest

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -5,13 +5,13 @@ on:
     push:
         branches: [ "main" ]
         paths:
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
             - go/**
             - .github/workflows/go.yml
     pull_request:
         paths:
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
             - go/**
             - .github/workflows/go.yml
@@ -24,8 +24,8 @@ jobs:
             fail-fast: false
             matrix:
                 go:
-                    - '1.18'
-                    - '1.21'
+                    - '1.18.10'
+                    - '1.22.0'
                 redis:
                     - 6.2.14
                     - 7.2.3
@@ -60,21 +60,21 @@ jobs:
               with:
                   redis-version: ${{ matrix.redis }}
 
-            - name: Install client dependencies
+            - name: Install tools for Go ${{ matrix.go }}
               working-directory: ./go
-              run: make install-tools
+              run: make install-tools-go${{ matrix.go }}
 
             - name: Build client
               working-directory: ./go
               run: make build
 
             - name: Run linters
               working-directory: ./go
-              run: make lint
+              run: make lint-ci
 
-            - name: Run unit tests
+            - name: Run tests
               working-directory: ./go
-              run: make unit-test-report
+              run: make test-and-report
 
             - name: Upload test reports
               if: always()
@@ -83,7 +83,7 @@ jobs:
               with:
                   name: test-reports-go-${{ matrix.go }}-redis-${{ matrix.redis }}-${{ matrix.os }}
                   path: |
-                      go/reports/unit-test-report.html
+                      go/reports/test-report.html
 
     build-amazonlinux-latest:
         if: github.repository_owner == 'aws'
@@ -93,7 +93,7 @@ jobs:
             matrix:
                 go:
                     - 1.18.10
-                    - 1.21.6
+                    - 1.22.0
         runs-on: ubuntu-latest
         container: amazonlinux:latest
         timeout-minutes: 15
@@ -135,29 +135,29 @@ jobs:
                   echo "/usr/local/go/bin" >> $GITHUB_PATH
                   echo "$HOME/go/bin" >> $GITHUB_PATH
 
-            - name: Install client dependencies
+            - name: Install tools for Go ${{ matrix.go }}
               working-directory: ./go
-              run: make install-tools
+              run: make install-tools-go${{ matrix.go }}
 
             - name: Build client
               working-directory: ./go
               run: make build
 
             - name: Run linters
               working-directory: ./go
-              run: make lint
+              run: make lint-ci
 
-            - name: Run unit tests
+            - name: Run tests
               working-directory: ./go
-              run: make unit-test-report
+              run: make test-and-report
 
             - name: Upload test reports
               if: always()
               continue-on-error: true
               uses: actions/upload-artifact@v4
               with:
                   name: test-reports-go-${{ matrix.go }}-amazon-linux-latest
-                  path: go/reports/unit-test-report.html
+                  path: go/reports/test-report.html
 
     lint-rust:
         timeout-minutes: 15

diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml
@@ -31,7 +31,7 @@ runs:
           shell: bash
           if: "${{ inputs.os == 'macos-latest' }}"
           run: |
-              brew install git gcc pkgconfig openssl redis
+              brew install git gcc pkgconfig openssl redis coreutils
 
         - name: Install software dependencies for Ubuntu
           shell: bash
@@ -52,7 +52,7 @@ runs:
               targets: ${{ inputs.target }}
 
         - name: Install protoc (protobuf)
-          uses: arduino/setup-protoc@v2.1.0
+          uses: arduino/setup-protoc@v3
           with:
               version: "25.1"
               repo-token: ${{ inputs.github-token }}
diff --git a/.github/workflows/java-benchmark.yml b/.github/workflows/java-benchmark.yml
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -4,16 +4,24 @@ on:
     push:
         branches: ["main"]
         paths:
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
-            - "java/**"
-            - ".github/workflows/java.yml"
+            - java/**
+            - .github/workflows/java.yml
+            - .github/workflows/install-shared-dependencies/action.yml
+            - .github/workflows/install-redis/action.yml
+            - .github/workflows/test-benchmark/action.yml
+            - .github/workflows/lint-rust/action.yml
     pull_request:
         paths:
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
-            - "java/**"
-            - ".github/workflows/java.yml"
+            - java/**
+            - .github/workflows/java.yml
+            - .github/workflows/install-shared-dependencies/action.yml
+            - .github/workflows/install-redis/action.yml
+            - .github/workflows/test-benchmark/action.yml
+            - .github/workflows/lint-rust/action.yml
 
 jobs:
     build-and-test-java-client:
@@ -67,6 +75,10 @@ jobs:
               working-directory: java
               run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
 
+            - uses: ./.github/workflows/test-benchmark
+              with:
+                  language-flag: -java
+
             - name: Upload test reports
               if: always()
               continue-on-error: true
@@ -77,6 +89,7 @@ jobs:
                       java/client/build/reports/**
                       java/integTest/build/reports/**
                       utils/clusters/**
+                      benchmarks/results/**
 
     build-amazonlinux-latest:
         if: github.repository_owner == 'aws'

diff --git a/.github/workflows/lint-rust/action.yml b/.github/workflows/lint-rust/action.yml
@@ -18,7 +18,7 @@ runs:
         - uses: Swatinem/rust-cache@v2
 
         - name: Install protoc (protobuf)
-          uses: arduino/setup-protoc@v2.1.0
+          uses: arduino/setup-protoc@v3
           with:
             version: "25.1"
 

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -4,7 +4,7 @@ on:
     push:
         branches: ["main"]
         paths:
-            - glide-core/**
+            - glide-core/src/**
             - submodules/**
             - node/**
             - utils/cluster_manager.py