Skip to content

Commit 6da4608

Browse files
committed
attempt to fix native build/test in docker-dev CI
1 parent 56e23c7 commit 6da4608

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

.github/workflows/drivers-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ jobs:
115115
- uses: Swatinem/rust-cache@v2
116116
with:
117117
workspaces: ./packages/cubejs-backend-native
118-
key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
119-
shared-key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
118+
key: native-${{ runner.OS }}-${{ matrix.target }}
119+
shared-key: native-${{ runner.OS }}-${{ matrix.target }}
120120
- name: Build native (fallback)
121121
if: (matrix.python-version == 'fallback')
122122
env:

.github/workflows/push.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,8 @@ jobs:
541541
- 5000:5000
542542
strategy:
543543
matrix:
544+
node-version: [ 20 ]
545+
target: [ "x86_64-unknown-linux-gnu" ]
544546
dockerfile:
545547
- dev.Dockerfile
546548
include:
@@ -567,10 +569,29 @@ jobs:
567569
df -h
568570
- name: Checkout
569571
uses: actions/checkout@v4
570-
- name: Use Node.js 20.x
572+
- name: Install Rust
573+
uses: actions-rust-lang/setup-rust-toolchain@v1
574+
with:
575+
toolchain: nightly-2024-07-15
576+
# override: true # this is by default on
577+
rustflags: ""
578+
components: rustfmt
579+
target: ${{ matrix.target }}
580+
- name: Install Node.js ${{ matrix.node-version }}
571581
uses: actions/setup-node@v4
572582
with:
573-
node-version: 20.x
583+
node-version: ${{ matrix.node-version }}
584+
- name: Install Yarn
585+
run: npm install -g yarn
586+
- name: Set Yarn version
587+
run: yarn policies set-version v1.22.22
588+
- name: Install cargo-cp-artifact
589+
run: npm install -g [email protected]
590+
- uses: Swatinem/rust-cache@v2
591+
with:
592+
workspaces: ./packages/cubejs-backend-native
593+
key: native-${{ runner.OS }}-${{ matrix.target }}
594+
shared-key: native-${{ runner.OS }}-${{ matrix.target }}
574595
- name: Get yarn cache directory path
575596
id: yarn-cache-dir-path
576597
run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
@@ -582,8 +603,6 @@ jobs:
582603
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
583604
restore-keys: |
584605
${{ runner.os }}-yarn-
585-
- name: Set Yarn version
586-
run: yarn policies set-version v1.22.22
587606
- name: Yarn install
588607
uses: nick-fields/retry@v3
589608
env:

0 commit comments

Comments
 (0)