Skip to content

Commit

Permalink
Revert "Also update matrices"
Browse files Browse the repository at this point in the history
This reverts commit a32e195.
  • Loading branch information
Bwc9876 committed Jan 3, 2024
1 parent 8d87ddd commit 2eccd81
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-22.04, windows-latest]
platform: [ubuntu-20.04, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout repository
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
Expand Down Expand Up @@ -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: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-22.04, windows-latest]
platform: [ubuntu-20.04, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout repository
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
Expand Down

0 comments on commit 2eccd81

Please sign in to comment.