From 9fd88af5371317e4a0095c9ba4775123936de73e Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Sat, 28 Jan 2023 13:08:35 +0100
Subject: [PATCH] Remove: [Actions] Ubuntu/Debian release binaries (instead,
 use the Generic)

---
 .github/workflows/release.yml | 105 +---------------------------------
 1 file changed, 1 insertion(+), 104 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 939649a14c..94eb6a8018 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -361,108 +361,6 @@ jobs:
         path: build/bundles
         retention-days: 5
 
-  linux-distro:
-    name: Linux (Distros)
-    needs: source
-
-    if: needs.source.outputs.is_tag == 'true'
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - container_image: "ubuntu:20.04"
-          bundle_name: "focal"
-          compiler: "g++"
-        - container_image: "ubuntu:22.04"
-          bundle_name: "jammy"
-          compiler: "g++"
-        - container_image: "debian:bullseye"
-          bundle_name: "bullseye"
-          compiler: "g++"
-
-    runs-on: ubuntu-20.04
-    container:
-      image: ${{ matrix.container_image }}
-
-    steps:
-    - name: Download source
-      uses: actions/download-artifact@v3
-      with:
-        name: internal-source
-
-    - name: Unpack source
-      run: |
-        tar -xf source.tar.gz --strip-components=1
-
-    - name: Install dependencies
-      run: |
-        echo "::group::Update apt"
-        apt-get update
-        echo "::endgroup::"
-
-        echo "::group::Install dependencies"
-        apt-get install -y --no-install-recommends \
-          cmake \
-          debhelper \
-          ${{ matrix.compiler }} \
-          git \
-          make \
-          openssl \
-          libfontconfig-dev \
-          libfluidsynth-dev \
-          libicu-dev \
-          liblzma-dev \
-          liblzo2-dev \
-          libsdl2-dev \
-          lsb-release \
-          zlib1g-dev \
-          # EOF
-        echo "::endgroup::"
-      env:
-        DEBIAN_FRONTEND: noninteractive
-
-    - name: Install GCC problem matcher
-      uses: ammaraskar/gcc-problem-matcher@master
-
-    - name: Build
-      run: |
-        mkdir -p build
-        cd build
-
-        echo "::group::CMake"
-        CXX=${{ matrix.compiler }} cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          # EOF
-        echo "::endgroup::"
-
-        echo "::group::Build"
-        echo "Running on $(nproc) cores"
-        # Ubuntu 18.04 cmake does not support -j so we pass the option to the native tool
-        cmake --build . -- -j $(nproc)
-        echo "::endgroup::"
-
-    - name: Create bundles
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        echo "::group::Run CPack"
-        cpack
-        echo "::endgroup::"
-
-        echo "::group::Cleanup"
-        # Remove the sha256 files CPack generates; we will do this ourself at
-        # the end of this workflow.
-        rm -f bundles/*.sha256
-        echo "::endgroup::"
-
-    - name: Store bundles
-      uses: actions/upload-artifact@v3
-      with:
-        name: openttd-linux-${{ matrix.bundle_name }}
-        path: build/bundles
-        retention-days: 5
-
   macos:
     name: MacOS
     needs: source
@@ -1036,7 +934,6 @@ jobs:
     - source
     - docs
     - linux
-    - linux-distro
     - macos
     - windows
 
@@ -1045,7 +942,7 @@ jobs:
     # "always()" is important here, it is the keyword to use to stop skipping
     # this job if any dependency is skipped. It looks a bit silly, but it is
     # how GitHub Actions work ;)
-    if: always() && needs.source.result == 'success' && needs.docs.result == 'success' && needs.linux.result == 'success' && (needs.linux-distro.result == 'success' || needs.linux-distro.result == 'skipped') && needs.macos.result == 'success' && needs.windows.result == 'success'
+    if: always() && needs.source.result == 'success' && needs.docs.result == 'success' && needs.linux.result == 'success' && needs.macos.result == 'success' && needs.windows.result == 'success'
 
     runs-on: ubuntu-20.04