From 6976cabf03fb8e65cc4f81c8473d0b36f0b837f2 Mon Sep 17 00:00:00 2001 From: jackleckert Date: Tue, 29 Jul 2025 15:07:29 -0700 Subject: [PATCH 1/2] update ubuntu container --- .github/workflows/ci.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1295cd889..bbc61e3b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,12 +12,19 @@ jobs: name: Run Checks and Build strategy: matrix: - os: - - windows-latest - - ubuntu-20.04 - - macos-latest + include: + - os: windows-latest + - os: ubuntu-latest + container: ubuntu:20.04 + - os: macos-latest runs-on: ${{ matrix.os }} + container: ${{ matrix.container }} steps: + - name: Install build dependencies (Ubuntu container) + if: matrix.container == 'ubuntu:20.04' + run: | + apt-get update && apt-get install -y build-essential git p7zip-full gcc + - name: Checkout source uses: actions/checkout@v4 with: @@ -69,7 +76,7 @@ jobs: needs: - build if: github.event_name == 'push' && contains(github.ref, 'refs/tags') - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Store git tag and date vars. run: | From 41f5eefb61dae6131a1a626d97e6a0b65f994806 Mon Sep 17 00:00:00 2001 From: jackleckert Date: Tue, 29 Jul 2025 15:15:27 -0700 Subject: [PATCH 2/2] build-essential includes gcc --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bbc61e3b0..d11d2afc1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - name: Install build dependencies (Ubuntu container) if: matrix.container == 'ubuntu:20.04' run: | - apt-get update && apt-get install -y build-essential git p7zip-full gcc + apt-get update && apt-get install -y build-essential git p7zip-full - name: Checkout source uses: actions/checkout@v4