Skip to content

Commit 23a160a

Browse files
authored
Merge branch 'master' into chore/deps-upgrade
2 parents fd25552 + f02af66 commit 23a160a

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.github/workflows/master.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
timeout-minutes: 60
4848
name: Build Linux Native backend for Dev image
4949
container:
50-
image: cubejs/rust-cross:x86_64-unknown-linux-gnu-15082024-python-3.9
50+
image: cubejs/rust-cross:x86_64-unknown-linux-gnu-15082024-python-3.11
5151

5252
steps:
5353
- name: Checkout
@@ -79,14 +79,14 @@ jobs:
7979
run: npm install -g [email protected]
8080
- name: Build native (with Python)
8181
env:
82-
PYO3_PYTHON: python3.9
82+
PYO3_PYTHON: python3.11
8383
CARGO_BUILD_TARGET: x86_64-unknown-linux-gnu
8484
working-directory: ./packages/cubejs-backend-native
8585
run: yarn run native:build-debug-python
8686
- name: Store build artifact for dev image
8787
uses: actions/upload-artifact@v4
8888
with:
89-
name: "native-linux-x64-glibc-3.9.node" # this name is referenced below in docker-image-dev
89+
name: "native-linux-x64-glibc-3.11.node" # this name is referenced below in docker-image-dev
9090
path: ./packages/cubejs-backend-native/index.node
9191
overwrite: true
9292

@@ -101,7 +101,7 @@ jobs:
101101
- name: Download backend-native artifact
102102
uses: actions/download-artifact@v4
103103
with:
104-
name: "native-linux-x64-glibc-3.9.node" # this name is referenced in above in native_linux
104+
name: "native-linux-x64-glibc-3.11.node" # this name is referenced in above in native_linux
105105
path: ./packages/cubejs-backend-native/
106106
- name: Login to DockerHub
107107
uses: docker/login-action@v3
@@ -110,6 +110,11 @@ jobs:
110110
password: ${{ secrets.DOCKERHUB_TOKEN }}
111111
- name: Set up QEMU
112112
uses: docker/setup-qemu-action@v3
113+
# current .dockerignore prevents use of native build
114+
- name: Unignore native from .dockerignore
115+
run: |
116+
grep -v -E "packages/cubejs-backend-native/((native)|(index.node))" .dockerignore > .dockerignore.tmp
117+
mv .dockerignore.tmp .dockerignore
113118
- name: Push to Docker Hub
114119
uses: docker/build-push-action@v6
115120
with:

.github/workflows/push.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ jobs:
106106
command: yarn install --frozen-lockfile
107107
- name: Lerna tsc
108108
run: yarn tsc
109-
- name: Build native (no python)
110-
run: cd packages/cubejs-backend-native && npm run native:build-release
111109
- name: Build client
112110
run: yarn build
113111
- name: Build cubejs-backend-native (with Python)
@@ -446,6 +444,9 @@ jobs:
446444
command: yarn install --frozen-lockfile
447445
- name: Lerna tsc
448446
run: yarn tsc
447+
- name: Build cubejs-backend-native (without Python)
448+
run: yarn run native:build-release
449+
working-directory: ./packages/cubejs-backend-native
449450
- name: Run Integration tests for ${{ matrix.db }} matrix
450451
uses: nick-fields/retry@v3
451452
with:
@@ -682,8 +683,9 @@ jobs:
682683
run: yarn build
683684
- name: Lerna tsc
684685
run: yarn tsc
685-
- name: Build native (no python)
686-
run: cd packages/cubejs-backend-native && npm run native:build-release
686+
- name: Build cubejs-backend-native (without Python)
687+
run: yarn run native:build-release
688+
working-directory: ./packages/cubejs-backend-native
687689
- name: Set up QEMU
688690
uses: docker/setup-qemu-action@v3
689691
# current .dockerignore prevents use of native build

packages/cubejs-testing/cypress.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ export default defineConfig({
1919
baseUrl: 'http://localhost:3080',
2020
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
2121
},
22-
})
22+
// set optimal values for the number of tests kept in memory
23+
numTestsKeptInMemory: 10,
24+
experimentalMemoryManagement: true,
25+
});

0 commit comments

Comments
 (0)