From 45306da4feaa52eb9fd2a6165c1e9d072833da6e Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Wed, 30 Aug 2023 22:57:29 -0400 Subject: [PATCH 1/2] Change ubuntu-latest to ubuntu-20.04 --- .github/workflows/build-nightly.yaml | 8 ++++---- .github/workflows/build-release.yaml | 10 +++++----- .github/workflows/build-standalone.yaml | 2 +- .github/workflows/build-test.yaml | 8 ++++---- .github/workflows/cache-master.yaml | 2 +- .github/workflows/post-build-release.yaml | 2 +- .github/workflows/test-pull_request.yaml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml index 50806b9626e..86680bde00b 100644 --- a/.github/workflows/build-nightly.yaml +++ b/.github/workflows/build-nightly.yaml @@ -14,7 +14,7 @@ jobs: matrix: configuration: [FastDebug, Release] name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/linux_build:sha-3d30dc5 steps: # - name: Cache Qt @@ -71,7 +71,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v1 @@ -190,7 +190,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: matrix: @@ -297,7 +297,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index 382176b81a9..fd000eb06ee 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -11,7 +11,7 @@ env: jobs: create_release: name: Create GitHub release - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Create Release id: create_release @@ -43,7 +43,7 @@ jobs: configuration: [FastDebug, Release] name: Linux needs: create_release # Don't run this job until create_release is done and successful - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/linux_build:sha-3d30dc5 steps: # - name: Cache Qt @@ -137,7 +137,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v1 @@ -271,7 +271,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: fail-fast: false # Run the other jobs in the matrix instead of failing them @@ -390,7 +390,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-standalone.yaml b/.github/workflows/build-standalone.yaml index b2c5904823c..8a146acc592 100644 --- a/.github/workflows/build-standalone.yaml +++ b/.github/workflows/build-standalone.yaml @@ -18,7 +18,7 @@ jobs: - configuration: Release tag_suffix: "" fail-fast: false - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 name: Checkout diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index eb0fd07db42..438e208b44c 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -14,7 +14,7 @@ jobs: matrix: configuration: [FastDebug, Release] name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/linux_build:sha-3d30dc5 steps: # - name: Cache Qt @@ -77,7 +77,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 @@ -203,7 +203,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: matrix: @@ -310,7 +310,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/cache-master.yaml b/.github/workflows/cache-master.yaml index 7f71fe95b54..f11e0fdcdd2 100644 --- a/.github/workflows/cache-master.yaml +++ b/.github/workflows/cache-master.yaml @@ -24,7 +24,7 @@ jobs: compiler: gcc-10 cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/linux_build:sha-3d30dc5 steps: # - name: Cache Qt diff --git a/.github/workflows/post-build-release.yaml b/.github/workflows/post-build-release.yaml index 8b57e527e74..aeba1e4fc27 100644 --- a/.github/workflows/post-build-release.yaml +++ b/.github/workflows/post-build-release.yaml @@ -38,7 +38,7 @@ env: jobs: post_builds: name: Post builds on Nebula and the forums - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Caller # Name of what called this yaml. Used to debug auto/manual step being triggered diff --git a/.github/workflows/test-pull_request.yaml b/.github/workflows/test-pull_request.yaml index dae3381c5e0..4705234b2ed 100644 --- a/.github/workflows/test-pull_request.yaml +++ b/.github/workflows/test-pull_request.yaml @@ -21,7 +21,7 @@ jobs: compiler: gcc-10 cmake_options: -DFSO_BUILD_WITH_OPENGL=OFF -DFSO_BUILD_WITH_VULKAN=OFF name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ghcr.io/scp-fs2open/linux_build:sha-3d30dc5 steps: # - name: Cache Qt From 679c3606c5d5ceb1945c499595a4c64377a3a72a Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Thu, 31 Aug 2023 17:30:08 -0400 Subject: [PATCH 2/2] modify per feedback --- .github/workflows/build-nightly.yaml | 6 +++--- .github/workflows/build-release.yaml | 8 ++++---- .github/workflows/build-standalone.yaml | 2 +- .github/workflows/build-test.yaml | 6 +++--- .github/workflows/post-build-release.yaml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml index 86680bde00b..ea3a8262a48 100644 --- a/.github/workflows/build-nightly.yaml +++ b/.github/workflows/build-nightly.yaml @@ -71,7 +71,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v1 @@ -190,7 +190,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: matrix: @@ -297,7 +297,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index fd000eb06ee..35cb911e572 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -11,7 +11,7 @@ env: jobs: create_release: name: Create GitHub release - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Create Release id: create_release @@ -137,7 +137,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v1 @@ -271,7 +271,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: fail-fast: false # Run the other jobs in the matrix instead of failing them @@ -390,7 +390,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-standalone.yaml b/.github/workflows/build-standalone.yaml index 8a146acc592..b2c5904823c 100644 --- a/.github/workflows/build-standalone.yaml +++ b/.github/workflows/build-standalone.yaml @@ -18,7 +18,7 @@ jobs: - configuration: Release tag_suffix: "" fail-fast: false - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 name: Checkout diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 438e208b44c..b2d0d089044 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -77,7 +77,7 @@ jobs: linux_zip: name: Build Linux distribution zip needs: build_linux - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 @@ -203,7 +203,7 @@ jobs: windows_zip: name: Build Windows distribution zip needs: build_windows - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d strategy: matrix: @@ -310,7 +310,7 @@ jobs: mac_zip: name: Build Mac distribution zip needs: build_mac - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/post-build-release.yaml b/.github/workflows/post-build-release.yaml index aeba1e4fc27..8b57e527e74 100644 --- a/.github/workflows/post-build-release.yaml +++ b/.github/workflows/post-build-release.yaml @@ -38,7 +38,7 @@ env: jobs: post_builds: name: Post builds on Nebula and the forums - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Caller # Name of what called this yaml. Used to debug auto/manual step being triggered