Skip to content

Commit

Permalink
Merge branch 'Aloxaf:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dreness authored Jan 28, 2024
2 parents 9e78de1 + cd1ec2f commit ae5e527
Show file tree
Hide file tree
Showing 24 changed files with 1,045 additions and 1,537 deletions.
61 changes: 58 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:

jobs:

test:
name: Test
test-linux:
name: x86_64-unknown-linux-gnu
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -32,7 +32,7 @@ jobs:
run: sudo apt-get update

- name: Install dependencies
run: sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev
run: sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev libharfbuzz-dev

- name: Cargo fmt
uses: actions-rs/cargo@v1
Expand All @@ -56,3 +56,58 @@ jobs:
with:
command: test
args: -- --nocapture

test-windows:
name: x86_64-pc-windows-msvc
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Install rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true

- name: Cargo check
uses: actions-rs/cargo@v1
with:
command: check
args: --no-default-features --features=bin

- name: Cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: --no-default-features --features=bin -- --nocapture

test-macos:
name: x86_64-apple-darwin
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Install rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true

- name: Cargo check
uses: actions-rs/cargo@v1
with:
command: check

- name: Cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: -- --nocapture
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- run: |
sudo apt-get update
sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev
sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev libharfbuzz-dev
- uses: actions/checkout@v2
with:
fetch-depth: 1
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: build
args: --release
args: --release --no-default-features --features=bin
- id: get_name
shell: bash
run: |
Expand Down
Loading

0 comments on commit ae5e527

Please sign in to comment.