Skip to content

Commit 54da603

Browse files
committed
Merge branch 'master' into chore-optimize-pre-aggrgations-api
2 parents ceb5bbb + dc5dec9 commit 54da603

File tree

731 files changed

+76652
-150132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

731 files changed

+76652
-150132
lines changed

.github/actions/integration/mssql.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ set -eo pipefail
44
# Debug log for test containers
55
export DEBUG=testcontainers
66

7-
export TEST_MSSQL_VERSION=2017-latest
8-
9-
echo "::group::MSSQL ${TEST_MSSQL_VERSION}";
10-
docker pull mcr.microsoft.com/mssql/server:${TEST_MSSQL_VERSION}
11-
yarn lerna run --concurrency 1 --stream --no-prefix integration:mssql
12-
echo "::endgroup::"
13-
147
export TEST_MSSQL_VERSION=2019-latest
158

169
echo "::group::MSSQL ${TEST_MSSQL_VERSION}";

.github/workflows/cloud.yml

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ on:
2525
- 'package.json'
2626
- 'yarn.lock'
2727

28+
env:
29+
CUBEJS_TESSERACT_ORCHESTRATOR: true
30+
2831
jobs:
2932
latest-tag-sha:
30-
runs-on: ubuntu-20.04
33+
runs-on: ubuntu-24.04
3134
outputs:
3235
sha: ${{ steps.get-tag.outputs.sha }}
3336
steps:
@@ -52,18 +55,27 @@ jobs:
5255
integration-cloud:
5356
needs: latest-tag-sha
5457
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
55-
runs-on: ubuntu-20.04
58+
runs-on: ubuntu-24.04
5659
timeout-minutes: 60
5760

5861
strategy:
5962
matrix:
6063
node-version: [ 20.x ]
6164
db: [ 'athena', 'bigquery', 'snowflake' ]
65+
target: [ "x86_64-unknown-linux-gnu" ]
6266
fail-fast: false
6367

6468
steps:
6569
- name: Checkout
6670
uses: actions/checkout@v4
71+
- name: Install Rust
72+
uses: actions-rust-lang/setup-rust-toolchain@v1
73+
with:
74+
toolchain: 1.84.1
75+
# override: true # this is by default on
76+
rustflags: ""
77+
components: rustfmt
78+
target: ${{ matrix.target }}
6779
- name: Install Node.js ${{ matrix.node-version }}
6880
uses: actions/setup-node@v4
6981
with:
@@ -82,17 +94,37 @@ jobs:
8294
- name: Set Yarn version
8395
run: yarn policies set-version v1.22.22
8496
- name: Yarn install
85-
run: CUBESTORE_SKIP_POST_INSTALL=true yarn install --frozen-lockfile
86-
- name: Build client
97+
uses: nick-fields/retry@v3
98+
env:
99+
CUBESTORE_SKIP_POST_INSTALL: true
100+
with:
101+
max_attempts: 3
102+
retry_on: error
103+
retry_wait_seconds: 15
104+
timeout_minutes: 20
105+
command: yarn install --frozen-lockfile
106+
- name: Build Core Client libraries
87107
run: yarn build
108+
- name: Build other packages
109+
run: yarn lerna run --concurrency 1 build
110+
env:
111+
NODE_OPTIONS: --max_old_space_size=4096
88112
- name: Lerna tsc
89113
run: yarn tsc
114+
- name: Build cubejs-backend-native (without Python)
115+
run: yarn run native:build-release
116+
working-directory: ./packages/cubejs-backend-native
90117
- name: Run Integration tests for ${{ matrix.db }} matrix
91-
timeout-minutes: 30
118+
uses: nick-fields/retry@v3
119+
with:
120+
max_attempts: 3
121+
retry_on: error
122+
retry_wait_seconds: 15
123+
timeout_minutes: 30
124+
command: ./.github/actions/integration/${{ matrix.db }}.sh
92125
env:
93126
CUBEJS_DB_BQ_CREDENTIALS: ${{ secrets.CUBEJS_DB_BQ_CREDENTIALS }}
94127
CUBEJS_AWS_KEY: ${{ secrets.CUBEJS_AWS_KEY }}
95128
CUBEJS_AWS_SECRET: ${{ secrets.CUBEJS_AWS_SECRET }}
96129
CUBEJS_DB_USER: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER }}
97130
CUBEJS_DB_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS }}
98-
run: ./.github/actions/integration/${{ matrix.db }}.sh

.github/workflows/cross-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
docker-dev:
1717
name: Build cross image for ${{ matrix.target }} target
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-24.04
1919
timeout-minutes: 120
2020
strategy:
2121
matrix:

.github/workflows/drivers-tests.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- 'packages/cubejs-mssql-driver/**'
2424
- 'packages/cubejs-mysql-driver/**'
2525
- 'packages/cubejs-postgres-driver/**'
26+
- 'packages/cubejs-redshift-driver/**'
2627
- 'packages/cubejs-snowflake-driver/**'
2728
- 'packages/cubejs-vertica-driver/**'
2829

@@ -49,16 +50,20 @@ on:
4950
- 'packages/cubejs-mssql-driver/**'
5051
- 'packages/cubejs-mysql-driver/**'
5152
- 'packages/cubejs-postgres-driver/**'
53+
- 'packages/cubejs-redshift-driver/**'
5254
- 'packages/cubejs-snowflake-driver/**'
5355
- 'packages/cubejs-vertica-driver/**'
5456

5557
# To test SQL API Push down
5658
- 'packages/cubejs-backend-native/**'
5759
- 'rust/cubesql/**'
5860

61+
env:
62+
CUBEJS_TESSERACT_ORCHESTRATOR: true
63+
5964
jobs:
6065
latest-tag-sha:
61-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-24.04
6267
outputs:
6368
sha: ${{ steps.get-tag.outputs.sha }}
6469
steps:
@@ -81,7 +86,7 @@ jobs:
8186
OUT: ${{ steps.get-tag.outputs.sha }}
8287

8388
native_linux:
84-
runs-on: ubuntu-20.04
89+
runs-on: ubuntu-24.04
8590
timeout-minutes: 60
8691
name: Build native Linux ${{ matrix.node-version }} ${{ matrix.target }} Python ${{ matrix.python-version }}
8792
strategy:
@@ -99,7 +104,7 @@ jobs:
99104
- name: Install Rust
100105
uses: actions-rust-lang/setup-rust-toolchain@v1
101106
with:
102-
toolchain: nightly-2024-07-15
107+
toolchain: 1.84.1
103108
# override: true # this is by default on
104109
rustflags: ""
105110
components: rustfmt
@@ -117,8 +122,8 @@ jobs:
117122
- uses: Swatinem/rust-cache@v2
118123
with:
119124
workspaces: ./packages/cubejs-backend-native
120-
key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
121-
shared-key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
125+
key: native-${{ runner.OS }}-${{ matrix.target }}
126+
shared-key: native-${{ runner.OS }}-${{ matrix.target }}
122127
- name: Build native (fallback)
123128
if: (matrix.python-version == 'fallback')
124129
env:
@@ -144,7 +149,7 @@ jobs:
144149
build:
145150
needs: [latest-tag-sha, native_linux]
146151
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
147-
runs-on: ubuntu-20.04
152+
runs-on: ubuntu-24.04
148153
timeout-minutes: 30
149154
env:
150155
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -165,7 +170,12 @@ jobs:
165170
uses: actions/download-artifact@v4
166171
with:
167172
name: backend-native
168-
path: packages/cubejs-backend-native/
173+
path: packages/cubejs-backend-native
174+
# current .dockerignore prevents use of native build
175+
- name: Unignore native from .dockerignore
176+
run: |
177+
grep -v -E "packages/cubejs-backend-native/((native)|(index.node))" .dockerignore > .dockerignore.tmp
178+
mv .dockerignore.tmp .dockerignore
169179
- name: Build and push
170180
uses: docker/build-push-action@v6
171181
with:
@@ -186,7 +196,7 @@ jobs:
186196
path: image.tar.gz
187197

188198
tests:
189-
runs-on: ubuntu-20.04
199+
runs-on: ubuntu-24.04
190200
timeout-minutes: 30
191201
needs: [latest-tag-sha, build]
192202
if: (needs['latest-tag-sha'].outputs.sha != github.sha)

0 commit comments

Comments
 (0)