chore: bump cross + fix cache

cube-js · Jul 15, 2024 · f1e7457 · f1e7457
1 parent b4e9713
commit f1e7457
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/.github/workflows/drivers-tests.yml b/.github/workflows/drivers-tests.yml
@@ -54,6 +54,9 @@ on:
       - 'packages/cubejs-backend-native/**'
       - 'rust/cubesql/**'
 
+env:
+  CROSS_VERSION: 01072024
+
 jobs:
   latest-tag-sha:
     runs-on: ubuntu-20.04
@@ -89,7 +92,7 @@ jobs:
         target: [ "x86_64-unknown-linux-gnu" ]
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-25062024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
 
     steps:
       - name: Checkout
@@ -115,8 +118,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./packages/cubejs-backend-native
-          key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
-          shared-key: native-${{ runner.OS }}-x86_64-unknown-linux-gnu
+          key: native-x86_64-unknown-linux-gnu
+          shared-key: native-x86_64-unknown-linux-gnu
       - name: Build native (fallback)
         if: (matrix.python-version == 'fallback')
         env:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,6 +6,9 @@ on:
       - 'v*.*.*'
       - 'v*.*.*-*'
 
+env:
+  CROSS_VERSION: 01072024
+
 jobs:
   npm:
     runs-on: ubuntu-24.04
@@ -82,7 +85,7 @@ jobs:
             package_target_libc: glibc
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-25062024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
     permissions:
       contents: write
     steps:
@@ -596,7 +599,7 @@ jobs:
             compress: false
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-25062024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
     permissions:
       contents: write
     steps:

diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
@@ -14,13 +14,16 @@ on:
       - 'packages/cubejs-backend-native/**'
       - 'rust/cubesql/**'
 
+env:
+  CROSS_VERSION: 01072024
+
 jobs:
   lint:
     runs-on: ubuntu-20.04
     timeout-minutes: 20
     name: Check fmt/clippy
     container:
-      image: cubejs/rust-cross:x86_64-unknown-linux-gnu-01072024
+      image: cubejs/rust-cross:x86_64-unknown-linux-gnu-${{ env.CROSS_VERSION }}
 
     steps:
       - name: Checkout
@@ -52,6 +55,8 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     name: Unit (Rewrite Engine)
+    container:
+      image: cubejs/rust-cross:x86_64-unknown-linux-gnu-${{ env.CROSS_VERSION }}
 
     steps:
       - name: Checkout
@@ -63,8 +68,8 @@ jobs:
         with:
           workspaces: ./rust/cubesql -> target
           # default key
-          key: cubesql-${{ runner.OS }}-x86_64-unknown-linux-gnu
-          shared-key: cubesql-${{ runner.OS }}-x86_64-unknown-linux-gnu
+          key: cubesql-x86_64-unknown-linux-gnu
+          shared-key: cubesql-x86_64-unknown-linux-gnu
       - name: Install [email protected]
         uses: baptiste0928/cargo-install@v3
         with:
@@ -107,7 +112,7 @@ jobs:
             target: "aarch64-unknown-linux-gnu"
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-01072024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
 
     steps:
       - name: Checkout
@@ -123,8 +128,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: ./rust/cubesql -> target
-          key: cubesql-${{ runner.OS }}-${{ matrix.target }}-${{ matrix.node-version }}
-          shared-key: cubesql-${{ runner.OS }}-${{ matrix.target }}-${{ matrix.node-version }}
+          key: cubesql-${{ matrix.target }}
+          shared-key: cubesql-${{ matrix.target }}
       - name: Install Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml
@@ -7,6 +7,9 @@ on:
     branches:
       - master
 
+env:
+  CROSS_VERSION: 01072024
+
 jobs:
   debian:
     name: Debian Rust ${{ matrix.rust }}
@@ -284,7 +287,7 @@ jobs:
             compress: false
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-25062024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain

diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml
@@ -12,6 +12,9 @@ on:
       - '.github/workflows/rust-cubestore.yml'
       - 'rust/cubestore/**'
 
+env:
+  CROSS_VERSION: 01072024
+
 jobs:
   debian:
     name: Debian Rust ${{ matrix.rust }}
@@ -215,7 +218,7 @@ jobs:
             compress: false
       fail-fast: false
     container:
-      image: cubejs/rust-cross:${{ matrix.target }}-25062024
+      image: cubejs/rust-cross:${{ matrix.target }}-${{ env.CROSS_VERSION }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain

diff --git a/rust/cubestore/Cross.toml b/rust/cubestore/Cross.toml
@@ -1,11 +1,11 @@
 [target.x86_64-unknown-linux-gnu]
-image = "cubejs/rust-cross:x86_64-unknown-linux-gnu-25062024"
+image = "cubejs/rust-cross:x86_64-unknown-linux-gnu-01072024"
 xargo = false
 
 [target.x86_64-unknown-linux-musl]
-image = "cubejs/rust-cross:x86_64-unknown-linux-musl-25062024"
+image = "cubejs/rust-cross:x86_64-unknown-linux-musl-01072024"
 xargo = false
 
 [target.aarch64-unknown-linux-gnu]
-image = "cubejs/rust-cross:aarch64-unknown-linux-gnu-25062024"
+image = "cubejs/rust-cross:aarch64-unknown-linux-gnu-01072024"
 xargo = false