Skip to content

Commit 50bcb2d

Browse files
authored
Merge pull request #452 from OutpostUniverse/updateLinuxBuildEnv
Update Linux build environment
2 parents b8500d0 + c64c31e commit 50bcb2d

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
compiler: [g++, clang++]
6565
runs-on: ubuntu-latest
6666
container:
67-
image: ghcr.io/outpostuniverse/op2utility:1.3
67+
image: ghcr.io/outpostuniverse/op2utility:1.4
6868
env:
6969
CXX: ${{ matrix.compiler }}
7070

7171
steps:
7272
- uses: actions/checkout@v6
7373

74-
- run: make
75-
- run: make test
76-
- run: make check
74+
- run: make --keep-going
75+
- run: make --keep-going test
76+
- run: make --keep-going check

.github/workflows/buildDockerBuildEnv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
env:
1010
buildPath: dockerBuildEnv/
11-
imageName: ghcr.io/outpostuniverse/op2utility:1.3
11+
imageName: ghcr.io/outpostuniverse/op2utility:1.4
1212

1313
steps:
1414
- uses: actions/checkout@v6

dockerBuildEnv/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
1313
build-essential \
1414
clang \
1515
cmake \
16+
git \
17+
ca-certificates \
1618
libgtest-dev \
1719
libgmock-dev \
1820
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)