From 8761bbfd3326f52a347d43f1ee76c21e062a29d1 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Mon, 18 May 2026 09:34:50 -0600 Subject: [PATCH 1/3] Update Linux build environment to include CI tools Add `git` to help with checkout from within the container, so checkout doesn't need to fall back on the REST API. This is particularly relevant for projects that use OP2Utility as a submodule, and wish to use the build image either directly or as a base image. They may want to use the `submodules: recursive` option, which requires `git`. Add `ca-certificates` so secure connections can be made. --- .github/workflows/buildDockerBuildEnv.yml | 2 +- dockerBuildEnv/Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildDockerBuildEnv.yml b/.github/workflows/buildDockerBuildEnv.yml index b86f36bd..ac621e76 100644 --- a/.github/workflows/buildDockerBuildEnv.yml +++ b/.github/workflows/buildDockerBuildEnv.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest env: buildPath: dockerBuildEnv/ - imageName: ghcr.io/outpostuniverse/op2utility:1.3 + imageName: ghcr.io/outpostuniverse/op2utility:1.4 steps: - uses: actions/checkout@v6 diff --git a/dockerBuildEnv/Dockerfile b/dockerBuildEnv/Dockerfile index 5f078ee6..229f92e9 100644 --- a/dockerBuildEnv/Dockerfile +++ b/dockerBuildEnv/Dockerfile @@ -13,6 +13,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins build-essential \ clang \ cmake \ + git \ + ca-certificates \ libgtest-dev \ libgmock-dev \ && rm -rf /var/lib/apt/lists/* From e0d75ad9d554c5c49b25c41620c5ee3aa1852128 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Mon, 18 May 2026 09:41:51 -0600 Subject: [PATCH 2/3] Update Linux build environment used by CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f953cfa..8c3523ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: compiler: [g++, clang++] runs-on: ubuntu-latest container: - image: ghcr.io/outpostuniverse/op2utility:1.3 + image: ghcr.io/outpostuniverse/op2utility:1.4 env: CXX: ${{ matrix.compiler }} From c64c31e0c6724072154930caa51ed0fe2c070089 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Date: Mon, 18 May 2026 09:43:41 -0600 Subject: [PATCH 3/3] Add `--keep-going` flag to `make` on CI --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c3523ed..d6e61408 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,6 @@ jobs: steps: - uses: actions/checkout@v6 - - run: make - - run: make test - - run: make check + - run: make --keep-going + - run: make --keep-going test + - run: make --keep-going check