Skip to content

Commit 1df0183

Browse files
committed
attempt to fix native build/test in docker-dev CI
1 parent 5a7de1b commit 1df0183

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
@@ -530,6 +530,8 @@ jobs:
530530
- 5000:5000
531531
strategy:
532532
matrix:
533+
node-version: [ 20 ]
534+
target: [ "x86_64-unknown-linux-gnu" ]
533535
dockerfile:
534536
- dev.Dockerfile
535537
include:
@@ -556,10 +558,29 @@ jobs:
556558
df -h
557559
- name: Checkout
558560
uses: actions/checkout@v4
559-
- name: Use Node.js 20.x
561+
- name: Install Rust
562+
uses: actions-rust-lang/setup-rust-toolchain@v1
563+
with:
564+
toolchain: nightly-2024-07-15
565+
# override: true # this is by default on
566+
rustflags: ""
567+
components: rustfmt
568+
target: ${{ matrix.target }}
569+
- name: Install Node.js ${{ matrix.node-version }}
560570
uses: actions/setup-node@v4
561571
with:
562-
node-version: 20.x
572+
node-version: ${{ matrix.node-version }}
573+
- name: Install Yarn
574+
run: npm install -g yarn
575+
- name: Set Yarn version
576+
run: yarn policies set-version v1.22.22
577+
- name: Install cargo-cp-artifact
578+
run: npm install -g [email protected]
579+
- uses: Swatinem/rust-cache@v2
580+
with:
581+
workspaces: ./packages/cubejs-backend-native
582+
key: native-${{ runner.OS }}-${{ matrix.target }}
583+
shared-key: native-${{ runner.OS }}-${{ matrix.target }}
563584
- name: Get yarn cache directory path
564585
id: yarn-cache-dir-path
565586
run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
@@ -571,8 +592,6 @@ jobs:
571592
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
572593
restore-keys: |
573594
${{ runner.os }}-yarn-
574-
- name: Set Yarn version
575-
run: yarn policies set-version v1.22.22
576595
- name: Yarn install
577596
uses: nick-fields/retry@v3
578597
env:

0 commit comments

Comments
 (0)