Merge branch 'merge_CI_from_main' into merge_CI_from_main

Signed-off-by: Avi Fenesh <[email protected]>
valkey-io · Nov 5, 2024 · 31303a4 · 31303a4
2 parents b004282 + 569c936
commit 31303a4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 44 deletions.
diff --git a/.github/json_matrices/build-matrix.json b/.github/json_matrices/build-matrix.json
@@ -16,7 +16,6 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
-        "CONTAINER": "2_28",
         "languages": ["python", "node", "java", "go", "dotnet"]
     },
     {

diff --git a/.github/json_matrices/supported-languages-versions.json b/.github/json_matrices/supported-languages-versions.json
@@ -11,8 +11,8 @@
     },
     {
         "language": "node",
-        "versions": ["16.x", "17.x", "18.x", "19.x", "20.x"],
-        "always-run-versions": ["16.x", "20.x"]
+        "versions": ["16.x", "17.x", "18.x", "19.x", "20.x", "21.x", "22.x"],
+        "always-run-versions": ["16.x", "22.x"]
     },
     {
         "language": "dotnet",

diff --git a/.github/workflows/full-matrix-tests.yml b/.github/workflows/full-matrix-tests.yml
@@ -37,8 +37,8 @@ on:
                 type: boolean
                 default: false
 
-    schedule: # Start every 3 hours, if the previous run is still running, it will be canceled
-        - cron: "0 */3 * * *"
+    schedule:
+        - cron: "0 3 * * *"
 
 concurrency:
     group: full-matrix-tests

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -115,6 +115,7 @@ jobs:
               run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
 
             - uses: ./.github/workflows/test-benchmark
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.java == '17' }}
               with:
                   language-flag: -java
 

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -108,6 +108,7 @@ jobs:
               working-directory: ./node
 
             - name: test hybrid node modules - commonjs
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.OS == 'ubuntu' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.node == '20.x' }}
               run: |
                   npm install
                   npm run test
@@ -116,6 +117,7 @@ jobs:
                   JEST_HTML_REPORTER_OUTPUT_PATH: test-report-commonjs.html
 
             - name: test hybrid node modules - ecma
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.OS == 'ubuntu' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.node == '20.x' }}
               run: |
                   npm install
                   npm run test
@@ -124,6 +126,7 @@ jobs:
                   JEST_HTML_REPORTER_OUTPUT_PATH: test-report-ecma.html
 
             - uses: ./.github/workflows/test-benchmark
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.OS == 'ubuntu' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.node == '20.x' }}
               with:
                   language-flag: -node
 

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -82,7 +82,7 @@ jobs:
     test-python:
         runs-on: ${{ matrix.host.RUNNER }}
         needs: get-matrices
-        timeout-minutes: 35
+        timeout-minutes: 50
         strategy:
             fail-fast: false
             matrix:
@@ -111,17 +111,6 @@ jobs:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   engine-version: ${{ matrix.engine.version }}
 
-            - name: Type check with mypy
-              working-directory: ./python
-              run: |
-                  # The type check should run inside the virtual env to get
-                  # all installed dependencies and build files
-                  source .env/bin/activate
-                  pip install mypy types-protobuf
-                  # Install the benchmark requirements
-                  pip install -r ../benchmarks/python/requirements.txt
-                  python -m mypy ..
-
             - name: Test with pytest
               working-directory: ./python
               run: |
@@ -130,6 +119,7 @@ jobs:
                   pytest --asyncio-mode=auto --html=pytest_report.html --self-contained-html
 
             - uses: ./.github/workflows/test-benchmark
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.OS == 'ubuntu' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.python == '3.12' }}
               with:
                   language-flag: -python
 
@@ -144,33 +134,6 @@ jobs:
                       utils/clusters/**
                       benchmarks/results/**
 
-    # run pubsub tests in another job - they take too much time
-    test-pubsub-python:
-        runs-on: ${{ matrix.host.RUNNER }}
-        needs: get-matrices
-        timeout-minutes: 35
-        strategy:
-            fail-fast: false
-            matrix:
-                python: ${{ fromJson(needs.get-matrices.outputs.version-matrix-output) }}
-                engine: ${{ fromJson(needs.get-matrices.outputs.engine-matrix-output) }}
-                host: ${{ fromJson(needs.get-matrices.outputs.host-matrix-output) }}
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Set up Python
-              uses: actions/setup-python@v5
-              with:
-                  python-version: ${{ matrix.python }}
-
-            - name: Build Python wrapper
-              uses: ./.github/workflows/build-python-wrapper
-              with:
-                  os: ${{ matrix.host.OS }}
-                  target: ${{ matrix.host.TARGET }}
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  engine-version: ${{ matrix.engine.version }}
-
             - name: Test pubsub with pytest
               working-directory: ./python
               run: |
@@ -226,6 +189,22 @@ jobs:
               run: |
                   black --check --diff .
 
+            - name: Set up Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: 3.12
+
+            - name: Type check with mypy
+              working-directory: ./python
+              run: |
+                  # The type check should run inside the virtual env to get
+                  # all installed dependencies and build files
+                  source .env/bin/activate
+                  pip install mypy types-protobuf
+                  # Install the benchmark requirements
+                  pip install -r ../benchmarks/python/requirements.txt
+                  python -m mypy ..
+
     get-containers:
         runs-on: ubuntu-latest
         if: ${{ github.event.inputs.full-matrix == 'true' || github.event_name == 'schedule' }}