Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed Sep 29, 2024
3 parents c8c4128 + 67dc6b9 + 49636ff commit 395155e
Show file tree
Hide file tree
Showing 6 changed files with 457 additions and 435 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build: [linux-musl, macos-x86_64, macos-aarch64, win-msvc]
include:
- build: linux-musl
os: ubuntu-20.04
os: ubuntu-22.04
target: x86_64-unknown-linux-musl
- build: macos-x86_64
os: macos-13
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
# - name: Install packages (Ubuntu)
# if: matrix.os == 'ubuntu-20.04'
# if: matrix.os == 'ubuntu-22.04'
# run: |
# sudo apt-get update
# sudo apt-get install -y --no-install-recommends xz-utils liblz4-tool musl-tools
Expand Down Expand Up @@ -79,11 +79,11 @@ jobs:
fail-fast: false
matrix:
# TODO: Make this more consistent with the other binary
platform: [macos-latest, ubuntu-20.04, windows-latest]
platform: [macos-latest, ubuntu-22.04, windows-latest]
include:
- platform: macos-latest
os: darwin
- platform: ubuntu-20.04
- platform: ubuntu-22.04
os: linux # TODO: musl?
- platform: windows-latest
os: windows-2022
Expand All @@ -101,7 +101,7 @@ jobs:
uses: dtolnay/rust-toolchain@stable

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
fi
clippy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Install Rust
Expand Down
Loading

0 comments on commit 395155e

Please sign in to comment.