Skip to content

Commit 4b49123

Browse files
Merge pull request #5965 from notimaginative/fix_linux_build_image
switch to new linux build image
2 parents 8fcf385 + 213bcbc commit 4b49123

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/build-nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
configuration: [FastDebug, Release]
1616
name: Linux
1717
runs-on: ubuntu-latest
18-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
18+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
1919
steps:
2020
- uses: actions/checkout@v1
2121
name: Checkout
@@ -24,7 +24,7 @@ jobs:
2424
- name: Configure CMake
2525
env:
2626
CONFIGURATION: ${{ matrix.configuration }}
27-
COMPILER: gcc-5
27+
COMPILER: gcc-9
2828
ENABLE_QTFRED: OFF
2929
run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
3030
- name: Compile

.github/workflows/build-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
name: Linux
4545
needs: create_release # Don't run this job until create_release is done and successful
4646
runs-on: ubuntu-latest
47-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
47+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
4848
steps:
4949
- uses: actions/checkout@v1
5050
# checks-out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
@@ -55,7 +55,7 @@ jobs:
5555
- name: Configure CMake
5656
env:
5757
CONFIGURATION: ${{ matrix.configuration }}
58-
COMPILER: gcc-5
58+
COMPILER: gcc-9
5959
ENABLE_QTFRED: OFF
6060
run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
6161
- name: Compile

.github/workflows/build-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
configuration: [FastDebug, Release]
1616
name: Linux
1717
runs-on: ubuntu-latest
18-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
18+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
1919
steps:
2020
- uses: actions/checkout@v1
2121
name: Checkout
@@ -30,7 +30,7 @@ jobs:
3030
- name: Configure CMake
3131
env:
3232
CONFIGURATION: ${{ matrix.configuration }}
33-
COMPILER: gcc-5
33+
COMPILER: gcc-9
3434
ENABLE_QTFRED: OFF
3535
run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
3636
- name: Compile

.github/workflows/cache-master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
configuration: [Debug, Release]
16-
compiler: [gcc-5, gcc-13, clang-16]
16+
compiler: [gcc-9, gcc-13, clang-16]
1717
cmake_options: [""]
1818
include:
1919
# Also include configurations that check if the code compiles without the graphics backends
@@ -25,7 +25,7 @@ jobs:
2525
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
2626
name: Linux
2727
runs-on: ubuntu-latest
28-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
28+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
2929
steps:
3030
- uses: actions/checkout@v1
3131
name: Checkout

.github/workflows/test-pull_request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
configuration: [Debug, Release]
13-
compiler: [gcc-5, gcc-13, clang-16]
13+
compiler: [gcc-9, gcc-13, clang-16]
1414
cmake_options: [""]
1515
include:
1616
# Also include configurations that check if the code compiles without the graphics backends
@@ -22,7 +22,7 @@ jobs:
2222
cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF
2323
name: Linux
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
25+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
2626
steps:
2727
- uses: actions/checkout@v1
2828
name: Checkout

.github/workflows/weekly-coverity-scan.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
build:
2020
name: Build FSO With Coverity Wrapper
2121
runs-on: ${{ matrix.config.os }}
22-
container: ghcr.io/scp-fs2open/linux_build:sha-5ac6f70
22+
container: ghcr.io/scp-fs2open/linux_build:sha-1ff82e8
2323
strategy:
2424
fail-fast: false
2525
matrix:
@@ -47,7 +47,7 @@ jobs:
4747
- name: Configure CMake for FSO
4848
env:
4949
CONFIGURATION: Release
50-
compiler: gcc-5
50+
compiler: gcc-9
5151
ENABLE_QTFRED: OFF
5252
run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
5353

ci/linux/configure_cmake.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
if [ "$COMPILER" = "gcc-5" ]; then
4-
export CC=gcc-5
5-
export CXX=g++-5
3+
if [ "$COMPILER" = "gcc-9" ]; then
4+
export CC=gcc-9
5+
export CXX=g++-9
66
fi
77
if [ "$COMPILER" = "gcc-13" ]; then
88
export CC=gcc-13

0 commit comments

Comments
 (0)