Skip to content

Commit 2a84f9a

Browse files
authored
Merge branch 'master' into bugfix/invalid-timestamp-floor-year-unit
2 parents 51af29f + 940c30f commit 2a84f9a

File tree

810 files changed

+129234
-29046
lines changed

Some content is hidden

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

810 files changed

+129234
-29046
lines changed

.github/actions/integration/athena.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::Athena [cloud]"
8+
export CUBEJS_AWS_KEY=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_KEY
9+
export CUBEJS_AWS_SECRET=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_SECRET
10+
811
export CUBEJS_AWS_REGION=us-east-1
912
export CUBEJS_AWS_S3_OUTPUT_LOCATION=s3://cubejs-opensource/testing/output
1013
export CUBEJS_DB_EXPORT_BUCKET=s3://cubejs-opensource/testing/export/

.github/actions/integration/bigquery.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::BigQuery [cloud]"
8+
export CUBEJS_DB_BQ_CREDENTIALS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_BQ_CREDENTIALS
89
export CUBEJS_DB_BQ_PROJECT_ID=cube-open-source
910
export CUBEJS_DB_EXPORT_BUCKET=cube-open-source-export-bucket
1011
yarn lerna run --concurrency 1 --stream --no-prefix integration:bigquery

.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/actions/integration/snowflake.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export CUBEJS_DB_NAME=DEMO_DB
99
export CUBEJS_DB_SNOWFLAKE_ACCOUNT=lxb31104
1010
export CUBEJS_DB_SNOWFLAKE_REGION=us-west-2
1111
export CUBEJS_DB_SNOWFLAKE_WAREHOUSE=COMPUTE_WH
12+
export CUBEJS_DB_USER=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_USER
13+
export CUBEJS_DB_PASS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_PASS
1214

1315
yarn lerna run --concurrency 1 --stream --no-prefix smoke:snowflake
1416

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
- [ ] Tests for the changes have been added if not covered yet
55
- [ ] Docs have been added / updated if required
66

7+
<!--
8+
9+
Please uncomment and fill the sections below if applicable. This will help the reviewer to get the context quicker.
10+
711
**Issue Reference this PR resolves**
812
913
[For example #12]
1014
1115
**Description of Changes Made (if issue reference is not provided)**
1216
1317
[Description goes here]
18+
-->

.github/workflows/cloud.yml

Lines changed: 0 additions & 130 deletions
This file was deleted.

.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: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ env:
6363

6464
jobs:
6565
latest-tag-sha:
66-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-24.04
6767
outputs:
6868
sha: ${{ steps.get-tag.outputs.sha }}
6969
steps:
@@ -86,12 +86,12 @@ jobs:
8686
OUT: ${{ steps.get-tag.outputs.sha }}
8787

8888
native_linux:
89-
runs-on: ubuntu-20.04
89+
runs-on: ubuntu-24.04
9090
timeout-minutes: 60
9191
name: Build native Linux ${{ matrix.node-version }} ${{ matrix.target }} Python ${{ matrix.python-version }}
9292
strategy:
9393
matrix:
94-
node-version: [ 20 ]
94+
node-version: [ 22 ]
9595
python-version: [ "fallback" ]
9696
target: [ "x86_64-unknown-linux-gnu" ]
9797
fail-fast: false
@@ -149,7 +149,7 @@ jobs:
149149
build:
150150
needs: [latest-tag-sha, native_linux]
151151
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
152-
runs-on: ubuntu-20.04
152+
runs-on: ubuntu-24.04
153153
timeout-minutes: 30
154154
env:
155155
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -196,7 +196,7 @@ jobs:
196196
path: image.tar.gz
197197

198198
tests:
199-
runs-on: ubuntu-20.04
199+
runs-on: ubuntu-24.04
200200
timeout-minutes: 30
201201
needs: [latest-tag-sha, build]
202202
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
@@ -207,10 +207,15 @@ jobs:
207207
clickhouse-export-bucket-s3
208208
databricks-jdbc
209209
databricks-jdbc-export-bucket-s3
210+
databricks-jdbc-export-bucket-s3-prefix
210211
databricks-jdbc-export-bucket-azure
212+
databricks-jdbc-export-bucket-azure-prefix
213+
databricks-jdbc-export-bucket-gcs
214+
databricks-jdbc-export-bucket-gcs-prefix
211215
redshift
212216
redshift-export-bucket-s3
213217
snowflake
218+
snowflake-encrypted-pk
214219
snowflake-export-bucket-s3
215220
snowflake-export-bucket-azure
216221
snowflake-export-bucket-azure-via-storage-integration
@@ -222,22 +227,25 @@ jobs:
222227
DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY: ${{ secrets.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY }}
223228
strategy:
224229
matrix:
225-
node:
226-
- 20.x
227230
database:
228231
- athena-export-bucket-s3
229232
- bigquery-export-bucket-gcs
230233
- clickhouse
231234
- clickhouse-export-bucket-s3
232235
- databricks-jdbc
233236
- databricks-jdbc-export-bucket-s3
237+
- databricks-jdbc-export-bucket-s3-prefix
234238
- databricks-jdbc-export-bucket-azure
239+
- databricks-jdbc-export-bucket-azure-prefix
240+
- databricks-jdbc-export-bucket-gcs
241+
- databricks-jdbc-export-bucket-gcs-prefix
235242
- mssql
236243
- mysql
237244
- postgres
238245
- redshift
239246
- redshift-export-bucket-s3
240247
- snowflake
248+
- snowflake-encrypted-pk
241249
- snowflake-export-bucket-s3
242250
- snowflake-export-bucket-azure
243251
- snowflake-export-bucket-azure-via-storage-integration
@@ -248,10 +256,10 @@ jobs:
248256
- name: Checkout
249257
uses: actions/checkout@v4
250258

251-
- name: Install Node.js 20.x
259+
- name: Install Node.js 22.x
252260
uses: actions/setup-node@v4
253261
with:
254-
node-version: 20.x
262+
node-version: 22.x
255263

256264
- name: Configure `yarn`
257265
run: yarn policies set-version v1.22.22
@@ -336,6 +344,8 @@ jobs:
336344
# Snowflake
337345
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER }}
338346
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS }}
347+
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY }}
348+
DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PASS }}
339349
with:
340350
max_attempts: 3
341351
retry_on: error

0 commit comments

Comments
 (0)