Skip to content

Commit 5a6194c

Browse files
timbrownls20timbrownls20
authored
Merge branch 'master' into vertica_driver
2 parents 7def0f3 + 15f5a12 commit 5a6194c

File tree

59 files changed

+623
-108
lines changed

Some content is hidden

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

59 files changed

+623
-108
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ jobs:
305305
overwrite: true
306306

307307
docker-default:
308-
needs: [npm, cubestore_linux, native_linux]
308+
needs: [npm, cubestore_linux, native_linux, detect_branch]
309309
name: Debian docker image
310310
runs-on: ${{ matrix.os }}
311311
strategy:
@@ -345,7 +345,11 @@ jobs:
345345
if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
346346
MINOR=${VERSION%.*}
347347
MAJOR=${MINOR%.*}
348-
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest"
348+
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR}"
349+
fi
350+
351+
if [ "${{ needs['detect_branch'].outputs.is_master }}" = "true" ]; then
352+
TAGS="$TAGS,${DOCKER_IMAGE}:latest"
349353
fi
350354
351355
{
@@ -385,7 +389,7 @@ jobs:
385389
IMAGE_VERSION=${{ steps.prep.outputs.version }}
386390
387391
docker-debian-jdk:
388-
needs: [npm, cubestore_linux, native_linux]
392+
needs: [npm, cubestore_linux, native_linux, detect_branch]
389393
name: Debian with jdk docker image
390394
runs-on: ubuntu-24.04
391395
timeout-minutes: 30
@@ -420,11 +424,15 @@ jobs:
420424
if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
421425
MINOR=${VERSION%.*}
422426
MAJOR=${MINOR%.*}
423-
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR}-jdk,${DOCKER_IMAGE}:${MAJOR}-jdk,${DOCKER_IMAGE}:jdk"
427+
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR}-jdk,${DOCKER_IMAGE}:${MAJOR}-jdk"
424428
elif [ "${{ github.event_name }}" = "push" ]; then
425429
TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}-jdk"
426430
fi
427431
432+
if [ "${{ needs['detect_branch'].outputs.is_master }}" = "true" ]; then
433+
TAGS="$TAGS,${DOCKER_IMAGE}:jdk"
434+
fi
435+
428436
{
429437
echo "version=${VERSION}"
430438
echo "tags=${TAGS}"
@@ -464,6 +472,7 @@ jobs:
464472
docker-cubestore:
465473
name: Cube Store Docker
466474
runs-on: ${{ matrix.os }}
475+
needs: [detect_branch]
467476
strategy:
468477
fail-fast: false
469478
matrix:
@@ -521,7 +530,11 @@ jobs:
521530
if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
522531
MINOR=${VERSION%.*}
523532
MAJOR=${MINOR%.*}
524-
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR}${{ matrix.postfix }},${DOCKER_IMAGE}:${MAJOR}${{ matrix.postfix }},${DOCKER_IMAGE}:${{ matrix.tag }}"
533+
TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR}${{ matrix.postfix }},${DOCKER_IMAGE}:${MAJOR}${{ matrix.postfix }}"
534+
fi
535+
536+
if [ "${{ needs['detect_branch'].outputs.is_master }}" = "true" ]; then
537+
TAGS="$TAGS,${DOCKER_IMAGE}:${{ matrix.tag }}"
525538
fi
526539
527540
{
@@ -770,28 +783,46 @@ jobs:
770783
}
771784
})
772785
773-
trigger-repo-sync:
774-
name: Trigger runtime repo
786+
detect_branch:
775787
runs-on: ubuntu-20.04
776-
needs: [docker-default]
777-
timeout-minutes: 15
788+
outputs:
789+
is_master: ${{ steps.detect_branch.outputs.is_master }}
790+
branch: ${{ steps.detect_branch.outputs.branch }}
778791
steps:
779792
- name: Checkout
780793
uses: actions/checkout@v4
781-
with:
782-
fetch-depth: 0 # Ensure full git history is fetched
783794
- name: Detect branch name
784795
id: detect_branch
796+
env:
797+
EVENT_BASE_REF: ${{ github.event.base_ref || 'master' }}
785798
run: |
786-
BRANCH_NAME=$(git branch -r --contains "$GITHUB_SHA" | grep -v 'HEAD' | head -n 1 | sed -e 's/.*origin\///')
787-
echo "branch_name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
799+
BRANCH=${EVENT_BASE_REF#refs/heads/}
800+
echo "Detected branch: $BRANCH"
801+
802+
IS_MASTER=false
803+
if [ "$BRANCH" == "master" ]; then
804+
IS_MASTER=true
805+
fi
806+
echo "Detected is_master: $IS_MASTER"
807+
808+
echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
809+
echo "is_master=$IS_MASTER" >> "$GITHUB_OUTPUT"
810+
811+
trigger-repo-sync:
812+
name: Trigger runtime repo
813+
runs-on: ubuntu-20.04
814+
needs: [docker-default, detect_branch]
815+
timeout-minutes: 15
816+
steps:
817+
- name: Checkout
818+
uses: actions/checkout@v4
788819
- name: Trigger runtime
789820
uses: actions/github-script@v6
790821
with:
791822
github-token: ${{ secrets.GH_TRIGGER_TOKEN }}
792823
script: |
793824
const tagName = process.env.GITHUB_REF.replace('refs/tags/', '');
794-
const branchName = '${{ steps.detect_branch.outputs.branch_name }}';
825+
const branchName = '${{ needs['detect_branch'].outputs.branch }}';
795826
796827
await github.rest.actions.createWorkflowDispatch({
797828
owner: 'cubedevinc',

‎CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,31 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.1.0](https://github.com/cube-js/cube/compare/v1.0.4...v1.1.0) (2024-10-24)
7+
8+
**Note:** Version bump only for package cubejs
9+
10+
11+
12+
13+
14+
## [1.0.4](https://github.com/cube-js/cube/compare/v1.0.3...v1.0.4) (2024-10-23)
15+
16+
17+
### Bug Fixes
18+
19+
* **cubejs-server-core:** driverError overriding ([#8852](https://github.com/cube-js/cube/issues/8852)) ([b7306d2](https://github.com/cube-js/cube/commit/b7306d2eb26d074d83c47ac49aea0fb8ac3c2138))
20+
* return client customized error, if present, on auth fail in playground ([#8842](https://github.com/cube-js/cube/issues/8842)) ([5cce98d](https://github.com/cube-js/cube/commit/5cce98d7bf03c7be244649e8f7503b1a38ded855)), closes [#CORE-1134](https://github.com/cube-js/cube/issues/CORE-1134)
21+
22+
23+
### Reverts
24+
25+
* Revert "fix(cubejs-server-core): driverError overriding (#8852)" (#8854) ([67eaa1c](https://github.com/cube-js/cube/commit/67eaa1cb1ab415f7010a1458912a0e4fffb48cd2)), closes [#8852](https://github.com/cube-js/cube/issues/8852) [#8854](https://github.com/cube-js/cube/issues/8854)
26+
27+
28+
29+
30+
631
## [1.0.3](https://github.com/cube-js/cube/compare/v1.0.2...v1.0.3) (2024-10-22)
732

833

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.3",
2+
"version": "1.1.0",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
55
"packages": [

‎packages/cubejs-api-gateway/CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.1.0](https://github.com/cube-js/cube/compare/v1.0.4...v1.1.0) (2024-10-24)
7+
8+
**Note:** Version bump only for package @cubejs-backend/api-gateway
9+
10+
11+
12+
13+
14+
## [1.0.4](https://github.com/cube-js/cube/compare/v1.0.3...v1.0.4) (2024-10-23)
15+
16+
17+
### Bug Fixes
18+
19+
* return client customized error, if present, on auth fail in playground ([#8842](https://github.com/cube-js/cube/issues/8842)) ([5cce98d](https://github.com/cube-js/cube/commit/5cce98d7bf03c7be244649e8f7503b1a38ded855)), closes [#CORE-1134](https://github.com/cube-js/cube/issues/CORE-1134)
20+
21+
22+
23+
24+
625
## [1.0.3](https://github.com/cube-js/cube/compare/v1.0.2...v1.0.3) (2024-10-22)
726

827
**Note:** Version bump only for package @cubejs-backend/api-gateway

‎packages/cubejs-api-gateway/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@cubejs-backend/api-gateway",
33
"description": "Cube.js API Gateway",
44
"author": "Cube Dev, Inc.",
5-
"version": "1.0.3",
5+
"version": "1.1.0",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/cube-js/cube.git",
@@ -27,7 +27,7 @@
2727
"dist/src/*"
2828
],
2929
"dependencies": {
30-
"@cubejs-backend/native": "1.0.3",
30+
"@cubejs-backend/native": "1.1.0",
3131
"@cubejs-backend/shared": "1.0.3",
3232
"@ungap/structured-clone": "^0.3.4",
3333
"body-parser": "^1.19.0",

‎packages/cubejs-athena-driver/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.1.0](https://github.com/cube-js/cube/compare/v1.0.4...v1.1.0) (2024-10-24)
7+
8+
**Note:** Version bump only for package @cubejs-backend/athena-driver
9+
10+
11+
12+
13+
14+
## [1.0.4](https://github.com/cube-js/cube/compare/v1.0.3...v1.0.4) (2024-10-23)
15+
16+
**Note:** Version bump only for package @cubejs-backend/athena-driver
17+
18+
19+
20+
21+
622
## [1.0.3](https://github.com/cube-js/cube/compare/v1.0.2...v1.0.3) (2024-10-22)
723

824
**Note:** Version bump only for package @cubejs-backend/athena-driver

‎packages/cubejs-athena-driver/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@cubejs-backend/athena-driver",
33
"description": "Cube.js Athena database driver",
44
"author": "Cube Dev, Inc.",
5-
"version": "1.0.3",
5+
"version": "1.1.0",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/cube-js/cube.git",
@@ -35,7 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"@cubejs-backend/linter": "^1.0.0",
38-
"@cubejs-backend/testing-shared": "1.0.3",
38+
"@cubejs-backend/testing-shared": "1.1.0",
3939
"@types/ramda": "^0.27.40",
4040
"typescript": "~5.2.2"
4141
},

‎packages/cubejs-backend-native/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.1.0](https://github.com/cube-js/cube/compare/v1.0.4...v1.1.0) (2024-10-24)
7+
8+
**Note:** Version bump only for package @cubejs-backend/native
9+
10+
11+
12+
13+
14+
## [1.0.4](https://github.com/cube-js/cube/compare/v1.0.3...v1.0.4) (2024-10-23)
15+
16+
**Note:** Version bump only for package @cubejs-backend/native
17+
18+
19+
20+
21+
622
## [1.0.3](https://github.com/cube-js/cube/compare/v1.0.2...v1.0.3) (2024-10-22)
723

824
**Note:** Version bump only for package @cubejs-backend/native

‎packages/cubejs-backend-native/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cubejs-backend/native",
3-
"version": "1.0.3",
3+
"version": "1.1.0",
44
"author": "Cube Dev, Inc.",
55
"description": "Native module for Cube.js (binding to Rust codebase)",
66
"main": "dist/js/index.js",
@@ -43,7 +43,7 @@
4343
"uuid": "^8.3.2"
4444
},
4545
"dependencies": {
46-
"@cubejs-backend/cubesql": "1.0.3",
46+
"@cubejs-backend/cubesql": "1.1.0",
4747
"@cubejs-backend/shared": "1.0.3",
4848
"@cubejs-infra/post-installer": "^0.0.7"
4949
},

‎packages/cubejs-bigquery-driver/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.1.0](https://github.com/cube-js/cube/compare/v1.0.4...v1.1.0) (2024-10-24)
7+
8+
**Note:** Version bump only for package @cubejs-backend/bigquery-driver
9+
10+
11+
12+
13+
14+
## [1.0.4](https://github.com/cube-js/cube/compare/v1.0.3...v1.0.4) (2024-10-23)
15+
16+
**Note:** Version bump only for package @cubejs-backend/bigquery-driver
17+
18+
19+
20+
21+
622
## [1.0.3](https://github.com/cube-js/cube/compare/v1.0.2...v1.0.3) (2024-10-22)
723

824

0 commit comments

Comments
 (0)