Skip to content

Commit c211b10

Browse files
authored
Merge pull request #448 from OutpostUniverse/updateGitHubActionsLinuxEnv
Update GitHub actions Linux environment
2 parents 962c2e0 + f9699eb commit c211b10

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/build.yml

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

.github/workflows/buildDockerBuildEnv.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
dockerBuild:
88
runs-on: ubuntu-latest
99
env:
10-
buildPath: .circleci/
11-
imageName: ghcr.io/outpostuniverse/op2utility:1.2
10+
buildPath: dockerBuildEnv/
11+
imageName: ghcr.io/outpostuniverse/op2utility:1.3
1212

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

dockerBuildEnv/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# For building on GitHub Actions
2+
3+
# To update:
4+
# 1. Bump the version number tag on `imageName` in: `.github/workflows/buildDockerBuildEnv.yml`
5+
# 2. Make and push changes to Dockerfile
6+
# 3. Run `buildDockerBuildEnv` workflow on branch with changes
7+
# https://github.com/OutpostUniverse/OP2Utility/actions/workflows/buildDockerBuildEnv.yml
8+
# 4. Update `.github/workflows/build.yml` workflow to use new version number tag
9+
10+
FROM ubuntu:resolute-20260421
11+
12+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
13+
build-essential \
14+
clang \
15+
cmake \
16+
libgtest-dev \
17+
libgmock-dev \
18+
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)