Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cube-js/cube
Browse files Browse the repository at this point in the history
  • Loading branch information
timbrownls20 committed Mar 18, 2024
2 parents f371f44 + 418a01e commit 76fcb77
Show file tree
Hide file tree
Showing 1,565 changed files with 70,943 additions and 126,105 deletions.
12 changes: 6 additions & 6 deletions .github/actions/integration/clickhouse.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ set -eo pipefail
# Debug log for test containers
export DEBUG=testcontainers

export TEST_CLICKHOUSE_VERSION=21.1.2
export TEST_CLICKHOUSE_VERSION=23.11

echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
echo "::endgroup::"

export TEST_CLICKHOUSE_VERSION=20.6
export TEST_CLICKHOUSE_VERSION=22.8

echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
echo "::endgroup::"

export TEST_CLICKHOUSE_VERSION=19
export TEST_CLICKHOUSE_VERSION=21.8

echo "::group::Clickhouse ${TEST_CLICKHOUSE_VERSION}";
docker pull yandex/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
docker pull clickhouse/clickhouse-server:${TEST_CLICKHOUSE_VERSION}
yarn lerna run --concurrency 1 --stream --no-prefix integration:clickhouse
echo "::endgroup::"
2 changes: 1 addition & 1 deletion .github/actions/integration/druid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export DEBUG=testcontainers

export TEST_POSTGRES_VERSION=13
export TEST_ZOOKEEPER_VERSION=3.5
export TEST_DRUID_VERSION=0.19.0
export TEST_DRUID_VERSION=27.0.0

echo "::group::Druid ${TEST_DRUID_VERSION}";

Expand Down
12 changes: 6 additions & 6 deletions .github/actions/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ echo "::group::Multidb"
yarn lerna run --concurrency 1 --stream --no-prefix smoke:multidb
echo "::endgroup::"

echo "::group::Prestodb"
docker rm -vf $(docker ps -aq)
docker rmi -f $(docker images -aq)
docker pull ahanaio/prestodb-sandbox:0.281
yarn lerna run --concurrency 1 --stream --no-prefix smoke:prestodb
echo "::endgroup::"
#echo "::group::Prestodb"
#docker rm -vf $(docker ps -aq)
#docker rmi -f $(docker images -aq)
#docker pull ahanaio/prestodb-sandbox:0.281
#yarn lerna run --concurrency 1 --stream --no-prefix smoke:prestodb
#echo "::endgroup::"

echo "::group::Trino"
yarn lerna run --concurrency 1 --stream --no-prefix smoke:trino
Expand Down
7 changes: 4 additions & 3 deletions .github/label-actions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"help wanted":
comment: |
If you are interested in working on this issue, please leave a comment below and we will be happy to assign the issue to you.
If this is the first time you are contributing a Pull Request to Cube.js, please check our [contribution guidelines](https://github.com/cube-js/cube/blob/master/CONTRIBUTING.md).
You can also post any questions while contributing in the #contributors channel in the [Cube.js Slack](https://slack.cube.dev/).
If you are interested in working on this issue, please provide go ahead and provide PR for that.
We'd be happy to review it and merge it.
If this is the first time you are contributing a Pull Request to Cube, please check our [contribution guidelines](https://github.com/cube-js/cube/blob/master/CONTRIBUTING.md).
You can also post any questions while contributing in the #contributors channel in the [Cube Slack](https://slack.cube.dev/).
27 changes: 13 additions & 14 deletions .github/workflows/birdbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-18.04, macos-11, windows-2019]
node-version: [16.x]
node-version: [18.x]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -52,9 +52,9 @@ jobs:
node_modules
rust/cubestore/node_modules
packages/*/node_modules
key: ${{ runner.os }}-workspace-main-16.x-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-workspace-main-16.x-
${{ runner.os }}-workspace-main-18.x-
- name: Set Yarn version
run: yarn policies set-version v1.22.19
- name: Yarn install
Expand All @@ -77,7 +77,7 @@ jobs:
run: |
cd packages/cubejs-testing/
npx cubejs-cli@${{ github.event.inputs.version }} create birdbox-test-project -d postgres
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}${{ matrix.node-arch }}
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
yarn run dataset:minimal
yarn run birdbox:cli:postgresql
- name: Slack Failure
Expand All @@ -97,7 +97,6 @@ jobs:
fail-fast: false
matrix:
target: ['postgresql', 'postgresql-cubestore', 'postgresql-pre-aggregations']
arch: ['', '-alpine']
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -107,10 +106,10 @@ jobs:
toolchain: nightly-2022-06-22
override: true
components: rustfmt
- name: Install Node.js 16.x
- name: Install Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- name: Restore lerna
uses: actions/cache@v3
with:
Expand All @@ -120,9 +119,9 @@ jobs:
node_modules
rust/cubestore/node_modules
packages/*/node_modules
key: ${{ runner.os }}-workspace-main-16.x-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-workspace-main-16.x-
${{ runner.os }}-workspace-main-18.x-
- name: Set Yarn version
run: yarn policies set-version v1.22.19
- name: Yarn install
Expand All @@ -143,7 +142,7 @@ jobs:
run: |
cd packages/cubejs-testing/
export DEBUG=testcontainers
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}${{ matrix.node-arch }}
export BIRDBOX_CUBEJS_VERSION=${{ github.event.inputs.version }}
yarn run dataset:minimal
yarn run birdbox:${{ matrix.target }}
- name: Slack Failure
Expand Down Expand Up @@ -176,10 +175,10 @@ jobs:
toolchain: nightly-2022-06-22
override: true
components: rustfmt
- name: Install Node.js 16.x
- name: Install Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- name: Restore lerna
uses: actions/cache@v3
with:
Expand All @@ -189,9 +188,9 @@ jobs:
node_modules
rust/cubestore/node_modules
packages/*/node_modules
key: ${{ runner.os }}-workspace-main-16.x-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-workspace-main-18.x-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-workspace-main-16.x-
${{ runner.os }}-workspace-main-18.x-
- name: Set Yarn version
run: yarn policies set-version v1.22.19
- name: Yarn install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

strategy:
matrix:
node-version: [ 16.x ]
node-version: [ 18.x ]
db: [ 'athena', 'bigquery', 'snowflake' ]
fail-fast: false

Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/docs-publish.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/docs.yml

This file was deleted.

Loading

0 comments on commit 76fcb77

Please sign in to comment.