Skip to content

Commit 63a3856

Browse files
authored
Merge branch 'master' into add-azure-credential
2 parents bfbd8a6 + 678a13a commit 63a3856

File tree

1,306 files changed

+114107
-75009
lines changed

Some content is hidden

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

1,306 files changed

+114107
-75009
lines changed

.dockerignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
!rust/cubestore/bin
1212
!rust/cubesql/package.json
1313

14+
# Ignoring builds for native from local machime to protect a problem with different architecture
15+
packages/cubejs-backend-native/index.node
16+
packages/cubejs-backend-native/native/
17+
# Caches
1418
packages/cubejs-backend-native/target
1519
packages/*/node_modules/
1620
packages/*/dist/
1721
packages/*/coverage/
22+
# Other
1823
packages/cubejs-server-core/playground/
19-
packages/cubejs-serverless
20-
packages/cubejs-serverless-aws
21-
packages/cubejs-serverless-google

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[*.rs]
13+
indent_size = 4

.github/actions/init-ci/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ runs:
77
using: "composite"
88
steps:
99
- name: Use Node.js ${{ inputs.node }}
10-
uses: actions/setup-node@v3
10+
uses: actions/setup-node@v4
1111
with:
1212
node-version: ${{ inputs.node }}
1313
- name: Cache node modules
14-
uses: actions/cache@v3
14+
uses: actions/cache@v4
1515
with:
1616
# npm cache files are stored in `~/.npm` on Linux/macOS
1717
path: ~/.npm

.github/buildkitd.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[worker.oci]
2+
max-parallelism = 1

.github/workflows/cloud.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
- id: git-log
3838
run: git log HEAD~30..HEAD
3939
- id: get-tag-test
40-
run: echo "$SHA $(git rev-list -n 1 $(git tag --contains $SHA))"
40+
run: echo "$SHA $(git rev-list -n 1 "$(git tag --contains "$SHA")")"
4141
env:
4242
SHA: ${{ github.sha }}
4343
- id: get-tag
44-
run: echo "::set-output name=sha::$(git rev-list -n 1 $(git tag --contains $SHA))"
44+
run: echo "sha=$(git rev-list -n 1 "$(git tag --contains "$SHA")")" >> "$GITHUB_OUTPUT"
4545
env:
4646
SHA: ${{ github.sha }}
4747
- id: get-tag-out
@@ -57,34 +57,30 @@ jobs:
5757

5858
strategy:
5959
matrix:
60-
node-version: [ 18.x ]
60+
node-version: [ 20.x ]
6161
db: [ 'athena', 'bigquery', 'snowflake' ]
6262
fail-fast: false
6363

6464
steps:
6565
- name: Checkout
6666
uses: actions/checkout@v4
67-
- name: Disable rustup update (issue workaround for Windows)
68-
run: rustup set auto-self-update disable
69-
if: contains(runner.os, 'windows')
70-
shell: bash
7167
- name: Install Node.js ${{ matrix.node-version }}
72-
uses: actions/setup-node@v3
68+
uses: actions/setup-node@v4
7369
with:
7470
node-version: ${{ matrix.node-version }}
7571
- name: Get yarn cache directory path
7672
id: yarn-cache-dir-path
77-
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
73+
run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
7874
shell: bash
7975
- name: Restore yarn cache
80-
uses: actions/cache@v3
76+
uses: actions/cache@v4
8177
with:
8278
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
8379
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
8480
restore-keys: |
8581
${{ runner.os }}-yarn-
8682
- name: Set Yarn version
87-
run: yarn policies set-version v1.22.19
83+
run: yarn policies set-version v1.22.22
8884
- name: Yarn install
8985
run: CUBESTORE_SKIP_POST_INSTALL=true yarn install --frozen-lockfile
9086
- name: Build client

.github/workflows/push-cross-images.yml renamed to .github/workflows/cross-images.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: Cross Images
33
on:
44
push:
55
paths:
6-
- '.github/workflows/push-cross-images.yml'
6+
- '.github/workflows/cross-images.yml'
77
- 'rust/cubestore/cross/**'
88
branches:
99
- 'master'
1010
pull_request:
1111
paths:
12-
- '.github/workflows/push-cross-images.yml'
12+
- '.github/workflows/cross-images.yml'
1313
- 'rust/cubestore/cross/**'
1414

1515
jobs:
@@ -33,22 +33,20 @@ jobs:
3333
with:
3434
username: ${{ secrets.DOCKERHUB_USERNAME }}
3535
password: ${{ secrets.DOCKERHUB_TOKEN }}
36-
- name: Set up QEMU
37-
uses: docker/setup-qemu-action@v2
3836
- name: Set up Docker Buildx
39-
uses: docker/setup-buildx-action@v2
37+
uses: docker/setup-buildx-action@v3
4038
with:
41-
version: v0.9.1
42-
driver-opts: network=host
43-
- name: Load .cross file
44-
uses: xom9ikk/dotenv@v2
39+
buildkitd-config: .github/buildkitd.toml
40+
- name: Build & push (base images)
41+
uses: docker/bake-action@v5
4542
with:
46-
path: rust/cubestore/cross/
47-
- name: Push to Docker Hub
48-
uses: docker/build-push-action@v3
43+
workdir: ./rust/cubestore/cross
44+
targets: ${{ matrix.target }}
45+
push: ${{ github.ref == 'refs/heads/master' }}
46+
- name: Build & push (with python)
47+
if: ${{ matrix.target != 'x86_64-unknown-linux-musl' }}
48+
uses: docker/bake-action@v5
4949
with:
50-
context: ./
51-
file: ./rust/cubestore/cross/${{ matrix.target }}.Dockerfile
52-
platforms: linux/amd64
50+
workdir: ./rust/cubestore/cross
51+
targets: ${{ matrix.target }}-python
5352
push: ${{ github.ref == 'refs/heads/master' }}
54-
tags: cubejs/rust-cross:${{ matrix.target }},cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}

.github/workflows/drivers-tests.yml

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ jobs:
6666
- id: git-log
6767
run: git log HEAD~30..HEAD
6868
- id: get-tag-test
69-
run: echo "$SHA $(git rev-list -n 1 $(git tag --contains $SHA))"
69+
run: echo "$SHA $(git rev-list -n 1 "$(git tag --contains "$SHA")")"
7070
env:
7171
SHA: ${{ github.sha }}
7272
- id: get-tag
73-
run: echo "::set-output name=sha::$(git rev-list -n 1 $(git tag --contains $SHA))"
73+
run: echo "sha=$(git rev-list -n 1 "$(git tag --contains "$SHA")")" >> "$GITHUB_OUTPUT"
7474
env:
7575
SHA: ${{ github.sha }}
7676
- id: get-tag-out
@@ -84,31 +84,32 @@ jobs:
8484
name: Build native Linux ${{ matrix.node-version }} ${{ matrix.target }} Python ${{ matrix.python-version }}
8585
strategy:
8686
matrix:
87-
node-version: [ 18 ]
87+
node-version: [ 20 ]
8888
python-version: [ "fallback" ]
8989
target: [ "x86_64-unknown-linux-gnu" ]
9090
fail-fast: false
9191
container:
92-
image: cubejs/rust-cross:${{ matrix.target }}-02042024
92+
image: cubejs/rust-cross:${{ matrix.target }}-15082024
9393

9494
steps:
9595
- name: Checkout
9696
uses: actions/checkout@v4
9797
- name: Install Rust
98-
uses: actions-rs/toolchain@v1
98+
uses: actions-rust-lang/setup-rust-toolchain@v1
9999
with:
100-
toolchain: nightly-2023-12-13
101-
override: true
100+
toolchain: nightly-2024-07-15
101+
# override: true # this is by default on
102+
rustflags: ""
102103
components: rustfmt
103104
target: ${{ matrix.target }}
104105
- name: Install Node.js ${{ matrix.node-version }}
105-
uses: actions/setup-node@v3
106+
uses: actions/setup-node@v4
106107
with:
107108
node-version: ${{ matrix.node-version }}
108109
- name: Install Yarn
109110
run: npm install -g yarn
110111
- name: Set Yarn version
111-
run: yarn policies set-version v1.22.19
112+
run: yarn policies set-version v1.22.22
112113
- name: Install cargo-cp-artifact
113114
run: npm install -g [email protected]
114115
- uses: Swatinem/rust-cache@v2
@@ -123,7 +124,7 @@ jobs:
123124
run: cd packages/cubejs-backend-native && npm run native:build-release
124125
- name: Setup cross compilation
125126
if: (matrix.target == 'aarch64-unknown-linux-gnu')
126-
uses: allenevans/set-env@v3.0.0
127+
uses: allenevans/set-env@v4.0.0
127128
with:
128129
PYO3_CROSS_PYTHON_VERSION: ${{ matrix.python-version }}
129130
- name: Build native (with Python)
@@ -153,23 +154,15 @@ jobs:
153154
with:
154155
username: ${{ secrets.DOCKERHUB_USERNAME }}
155156
password: ${{ secrets.DOCKERHUB_TOKEN }}
156-
157157
- name: Set up QEMU
158-
uses: docker/setup-qemu-action@v2
159-
158+
uses: docker/setup-qemu-action@v3
160159
- name: Download native build
161160
uses: actions/download-artifact@v4
162161
with:
163162
name: backend-native
164163
path: packages/cubejs-backend-native/
165-
166-
- name: Set up Docker Buildx
167-
uses: docker/setup-buildx-action@v2
168-
with:
169-
version: v0.10.3
170-
171164
- name: Build and push
172-
uses: docker/build-push-action@v4
165+
uses: docker/build-push-action@v6
173166
with:
174167
context: .
175168
file: ./packages/cubejs-docker/testing-drivers.Dockerfile
@@ -183,8 +176,8 @@ jobs:
183176
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
184177
strategy:
185178
matrix:
186-
node:
187-
- 18.x
179+
node:
180+
- 20.x
188181
database:
189182
- athena
190183
- bigquery
@@ -201,29 +194,29 @@ jobs:
201194
- name: Checkout
202195
uses: actions/checkout@v4
203196

204-
- name: Install Node.js 18.x
205-
uses: actions/setup-node@v3
197+
- name: Install Node.js 20.x
198+
uses: actions/setup-node@v4
206199
with:
207-
node-version: 18.x
200+
node-version: 20.x
208201

209202
- name: Configure `yarn`
210-
run: yarn policies set-version v1.22.19
203+
run: yarn policies set-version v1.22.22
211204

212205
- name: Get yarn cache directory path
213206
id: yarn-cache-dir-path
214-
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
207+
run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
215208
shell: bash
216209
- name: Restore yarn cache
217210
# We don't want to save it on finish, restore only!
218-
uses: actions/cache/restore@v3
211+
uses: actions/cache/restore@v4
219212
with:
220213
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
221214
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
222215
restore-keys: |
223216
${{ runner.os }}-yarn-
224217
225218
- name: Install dependencies
226-
uses: nick-invision/retry@v2
219+
uses: nick-fields/retry@v3
227220
env:
228221
CUBESTORE_SKIP_POST_INSTALL: true
229222
with:

0 commit comments

Comments
 (0)