Skip to content

Commit

Permalink
Merge branch 'worksoup-dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/rust.yml
  • Loading branch information
learturely committed Dec 12, 2024
2 parents 64a5479 + 307f382 commit 8fa5446
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install libdbus-1-dev
run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev
- name: Install Deps
run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev libxcb1-dev
- name: Install latest nightly
uses: crusty-pie/toolchain@v1
with:
Expand Down Expand Up @@ -60,9 +60,9 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Install libdbus-1-dev
- name: Install Deps
if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev
run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev libxcb1-dev
- name: Install latest nightly
uses: crusty-pie/toolchain@v1
with:
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8fa5446

Please sign in to comment.