From 2eccd81ed4e81f4c226bea8e7563d8a0625c4073 Mon Sep 17 00:00:00 2001 From: Ben C Date: Wed, 3 Jan 2024 15:18:16 -0500 Subject: [PATCH] Revert "Also update matrices" This reverts commit a32e1954662a6864878b6df267e1c2cc0f8e0c7e. --- .github/workflows/nightly_build.yml | 6 +++--- .github/workflows/release_cli.yml | 10 +++++----- .github/workflows/release_gui.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 1e2e5aa3c..9cd8e2c9b 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-22.04, windows-latest] + platform: [ubuntu-20.04, windows-latest] runs-on: ${{ matrix.platform }} steps: @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev @@ -81,7 +81,7 @@ jobs: - name: Upload GUI (Linux) uses: actions/upload-artifact@v4 - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' with: name: GUI-Nightly-Linux path: | diff --git a/.github/workflows/release_cli.yml b/.github/workflows/release_cli.yml index 17d02d525..64d9e6fb2 100644 --- a/.github/workflows/release_cli.yml +++ b/.github/workflows/release_cli.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-22.04, windows-latest] + platform: [ubuntu-20.04, windows-latest] runs-on: ${{ matrix.platform }} steps: @@ -28,7 +28,7 @@ jobs: shared-key: ${{ runner.os }}-rust-cache-${{ hashFiles('Cargo.lock') }} - name: Install Deb Generator - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: cargo install cargo-deb - name: Build CLI @@ -44,17 +44,17 @@ jobs: ANALYTICS_API_KEY: ${{ secrets.ANALYTICS_API_KEY }} - name: Generate Dist Folder - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: cargo xtask dist_cli env: ANALYTICS_API_KEY: ${{ secrets.ANALYTICS_API_KEY }} - name: Archive Dist Files - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: tar --zstd -cfowmods.tar.zst -C target/release owmods -C ../../dist/cli/ man completions - name: Generate Deb File - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: cargo deb -p owmods_cli env: ANALYTICS_API_KEY: ${{ secrets.ANALYTICS_API_KEY }} diff --git a/.github/workflows/release_gui.yml b/.github/workflows/release_gui.yml index 29eb048dd..dcf91ca0e 100644 --- a/.github/workflows/release_gui.yml +++ b/.github/workflows/release_gui.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-22.04, windows-latest] + platform: [ubuntu-20.04, windows-latest] runs-on: ${{ matrix.platform }} steps: @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: Install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' + if: matrix.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev