Skip to content

Commit c8cfd62

Browse files
authored
fix(cubestore): Store value_version for secondary index as u32 (#7019)
1 parent 2161227 commit c8cfd62

File tree

18 files changed

+961
-57
lines changed

18 files changed

+961
-57
lines changed

.github/workflows/rust-cubestore-master.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,32 @@ on:
1010
jobs:
1111
debian:
1212
name: Debian Rust ${{ matrix.rust }}
13-
runs-on: ubuntu-20.04
14-
timeout-minutes: 60
13+
# 22.04 has gcc 11, new binutils (ld)
14+
runs-on: ubuntu-22.04
15+
timeout-minutes: 90
1516
strategy:
1617
fail-fast: false
1718
matrix:
1819
rust: [nightly-2022-06-22]
1920
env:
2021
RUST: ${{ matrix.rust }}
2122
steps:
23+
- name: Maximize build space (disk space limitations)
24+
run: |
25+
echo "Before"
26+
df -h
27+
sudo apt-get remove -y 'php.*'
28+
sudo apt-get remove -y '^mongodb-.*'
29+
sudo apt-get remove -y '^mysql-.*'
30+
sudo apt-get autoremove -y
31+
sudo apt-get clean
32+
33+
sudo rm -rf /usr/share/dotnet
34+
sudo rm -rf /usr/local/lib/android
35+
sudo rm -rf /opt/ghc
36+
sudo rm -rf /opt/hostedtoolcache/CodeQL
37+
echo "After"
38+
df -h
2239
- name: Checkout
2340
uses: actions/checkout@v3
2441
- name: Install Rust
@@ -27,10 +44,11 @@ jobs:
2744
toolchain: ${{ matrix.rust }}
2845
override: true
2946
components: rustfmt
30-
- uses: Swatinem/rust-cache@v1
47+
- uses: Swatinem/rust-cache@v2
3148
with:
32-
working-directory: ./rust/cubestore
33-
key: ubuntu-20.04
49+
workspaces: ./rust/cubestore -> target
50+
shared-key: cubestore
51+
key: ubuntu-22.04
3452
- name: Run cargo fmt cubestore
3553
uses: actions-rs/cargo@v1
3654
with:
@@ -223,11 +241,12 @@ jobs:
223241
target: ${{ matrix.target }}
224242
override: true
225243
components: rustfmt
226-
- uses: Swatinem/rust-cache@v1
244+
- uses: Swatinem/rust-cache@v2
227245
with:
228-
working-directory: rust/cubestore
229-
key: cross-${{ runner.OS }}-${{ matrix.target }}
230-
sharedKey: cross-${{ runner.OS }}-${{ matrix.target }}
246+
workspaces: ./rust/cubestore -> target
247+
# We should use a separate key for testing to pass disk space limitations
248+
shared-key: cubestore-testing
249+
key: ubuntu-20.04
231250
- run: source .github/actions/${{ matrix.before_script }}.sh
232251
if: ${{ matrix.before_script }}
233252
shell: bash

.github/workflows/rust-cubestore.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,32 @@ on:
1515
jobs:
1616
debian:
1717
name: Debian Rust ${{ matrix.rust }}
18-
runs-on: ubuntu-20.04
19-
timeout-minutes: 60
18+
# 22.04 has gcc 11, new binutils (ld)
19+
runs-on: ubuntu-22.04
20+
timeout-minutes: 90
2021
strategy:
2122
fail-fast: false
2223
matrix:
2324
rust: [nightly-2022-06-22]
2425
env:
2526
RUST: ${{ matrix.rust }}
2627
steps:
28+
- name: Maximize build space (disk space limitations)
29+
run: |
30+
echo "Before"
31+
df -h
32+
sudo apt-get remove -y 'php.*'
33+
sudo apt-get remove -y '^mongodb-.*'
34+
sudo apt-get remove -y '^mysql-.*'
35+
sudo apt-get autoremove -y
36+
sudo apt-get clean
37+
38+
sudo rm -rf /usr/share/dotnet
39+
sudo rm -rf /usr/local/lib/android
40+
sudo rm -rf /opt/ghc
41+
sudo rm -rf /opt/hostedtoolcache/CodeQL
42+
echo "After"
43+
df -h
2744
- name: Checkout
2845
uses: actions/checkout@v3
2946
- name: Install Rust
@@ -32,10 +49,12 @@ jobs:
3249
toolchain: ${{ matrix.rust }}
3350
override: true
3451
components: rustfmt
35-
- uses: Swatinem/rust-cache@v1
52+
- uses: Swatinem/rust-cache@v2
3653
with:
37-
working-directory: ./rust/cubestore
38-
key: ubuntu-20.04
54+
workspaces: ./rust/cubestore -> target
55+
# We should use a separate key for testing to pass disk space limitations
56+
shared-key: cubestore-testing
57+
key: ubuntu-22.04
3958
- name: Run cargo fmt cubestore
4059
uses: actions-rs/cargo@v1
4160
with:

0 commit comments

Comments
 (0)