Merge branch 'master' into chore/deps-upgrade

cube-js · Jan 27, 2025 · 23a160a · 23a160a
2 parents fd25552 + f02af66
commit 23a160a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 60
     name: Build Linux Native backend for Dev image
     container:
-      image: cubejs/rust-cross:x86_64-unknown-linux-gnu-15082024-python-3.9
+      image: cubejs/rust-cross:x86_64-unknown-linux-gnu-15082024-python-3.11
 
     steps:
       - name: Checkout
@@ -79,14 +79,14 @@ jobs:
         run: npm install -g [email protected]
       - name: Build native (with Python)
         env:
-          PYO3_PYTHON: python3.9
+          PYO3_PYTHON: python3.11
           CARGO_BUILD_TARGET: x86_64-unknown-linux-gnu
         working-directory: ./packages/cubejs-backend-native
         run: yarn run native:build-debug-python
       - name: Store build artifact for dev image
         uses: actions/upload-artifact@v4
         with:
-          name: "native-linux-x64-glibc-3.9.node"    # this name is referenced below in docker-image-dev
+          name: "native-linux-x64-glibc-3.11.node"    # this name is referenced below in docker-image-dev
           path: ./packages/cubejs-backend-native/index.node
           overwrite: true
 
@@ -101,7 +101,7 @@ jobs:
       - name: Download backend-native artifact
         uses: actions/download-artifact@v4
         with:
-          name: "native-linux-x64-glibc-3.9.node"    # this name is referenced in above in native_linux
+          name: "native-linux-x64-glibc-3.11.node"    # this name is referenced in above in native_linux
           path: ./packages/cubejs-backend-native/
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -110,6 +110,11 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+      # current .dockerignore prevents use of native build
+      - name: Unignore native from .dockerignore
+        run: |
+          grep -v -E "packages/cubejs-backend-native/((native)|(index.node))" .dockerignore > .dockerignore.tmp
+          mv .dockerignore.tmp .dockerignore
       - name: Push to Docker Hub
         uses: docker/build-push-action@v6
         with:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -106,8 +106,6 @@ jobs:
           command: yarn install --frozen-lockfile
       - name: Lerna tsc
         run: yarn tsc
-      - name: Build native (no python)
-        run: cd packages/cubejs-backend-native && npm run native:build-release
       - name: Build client
         run: yarn build
       - name: Build cubejs-backend-native (with Python)
@@ -446,6 +444,9 @@ jobs:
           command: yarn install --frozen-lockfile
       - name: Lerna tsc
         run: yarn tsc
+      - name: Build cubejs-backend-native (without Python)
+        run: yarn run native:build-release
+        working-directory: ./packages/cubejs-backend-native
       - name: Run Integration tests for ${{ matrix.db }} matrix
         uses: nick-fields/retry@v3
         with:
@@ -682,8 +683,9 @@ jobs:
         run: yarn build
       - name: Lerna tsc
         run: yarn tsc
-      - name: Build native (no python)
-        run: cd packages/cubejs-backend-native && npm run native:build-release
+      - name: Build cubejs-backend-native (without Python)
+        run: yarn run native:build-release
+        working-directory: ./packages/cubejs-backend-native
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       # current .dockerignore prevents use of native build

diff --git a/packages/cubejs-testing/cypress.config.ts b/packages/cubejs-testing/cypress.config.ts
@@ -19,4 +19,7 @@ export default defineConfig({
     baseUrl: 'http://localhost:3080',
     specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
   },
-})
+  // set optimal values for the number of tests kept in memory
+  numTestsKeptInMemory: 10,
+  experimentalMemoryManagement: true,
+});