Skip to content

Commit 5b19589

Browse files
committed
fix ubuntu CI failures
1 parent 34dfe91 commit 5b19589

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/dart.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,13 @@ jobs:
5555
5656
valgrind:
5757
runs-on: ubuntu-20.04
58-
container:
59-
image: google/dart:latest
6058
steps:
59+
- uses: dart-lang/setup-dart@v1
6160
- uses: actions/checkout@v1
6261
- name: Install ObjectBox C-API
6362
run: ./install.sh
6463
- name: Install Valgrind
65-
run: |
66-
apt update
67-
apt install -y valgrind
64+
run: ./tool/apt-install.sh valgrind
6865
- name: Test
6966
working-directory: objectbox
7067
# let tests know we want a faster/shorter version, if available (to prevent timeouts in CI)
@@ -93,8 +90,8 @@ jobs:
9390
channel: ${{ matrix.channel }}
9491
- run: echo $PATH
9592
- run: flutter --version
96-
- if: ${{ startsWith(matrix.os, 'ubuntu') }}
97-
run: sudo apt-get install ninja-build pkg-config libgtk-3-dev
9893
- uses: actions/checkout@v2
94+
- if: ${{ startsWith(matrix.os, 'ubuntu') }}
95+
run: ./tool/apt-install.sh ninja-build pkg-config libgtk-3-dev
9996
- run: make integration-test
10097
working-directory: objectbox

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Generage test coverage
4343
working-directory: objectbox
4444
run: |
45-
sudo apt-get install lcov
45+
../tool/apt-install.sh lcov
4646
make depend
4747
make coverage
4848
- uses: devmasx/[email protected]

tool/apt-install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -euox pipefail
3+
4+
sudo apt-get update
5+
sudo apt-get install --yes --no-install-recommends $@

0 commit comments

Comments
 (0)