Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into connection-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
fabi321 committed May 30, 2024
2 parents 1c367f8 + 1abb9ae commit f3b2931
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
toolchain: nightly
override: true
- name: Install libvncserver-dev
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- uses: actions-rs/cargo@v1
with:
command: install
Expand All @@ -56,7 +56,7 @@ jobs:
components: rustfmt
override: true
- name: Install libvncserver-dev
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- uses: actions-rs/cargo@v1
with:
command: fmt
Expand All @@ -74,7 +74,7 @@ jobs:
components: clippy
override: true
- name: Install libvncserver-dev
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- name: Run clippy action to produce annotations
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -101,7 +101,7 @@ jobs:
components: rustfmt
override: true
- name: Install libvncserver-dev
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- uses: actions-rs/cargo@v1
with:
command: doc
Expand All @@ -118,7 +118,7 @@ jobs:
toolchain: nightly
override: true
- name: Install libvncserver-dev
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- name: Test with all features turned off
uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- name: Print CPU architecture
run: uname -m && uname -a
- if: runner.os == 'Linux'
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- if: runner.os == 'macOS'
run: brew install libvncserver
# - if: runner.os == 'Windows'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
target: ${{ matrix.target }}
override: true
- if: runner.os == 'Linux'
run: sudo apt install -y libvncserver-dev
run: sudo apt update && sudo apt install -y libvncserver-dev
- if: runner.os == 'macOS'
run: brew install libvncserver
- name: Build binary
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ All notable changes to this project will be documented in this file.
### Changed

- Second rewrite with the following improvements: ([#21])
* Put `Parser` behind a trait, so that we can have multiple implementation in parallel
* Put `Parser` behind a trait, so that we can have multiple implementations in parallel
* Use cargo workspaces
* Better error handling using snafu
- BREAKING: Build release binaries without support for VNC, as this
* Has a dependecy on a dynamically linked library on the host executing the binary
* Needs a cross-compilation (which didn't work), as the macOS GitHub runners all run on arm and we try to build an x86 binary

[#21]: https://github.com/sbernauer/breakwater/pull/21
[#22]: https://github.com/sbernauer/breakwater/pull/22

0 comments on commit f3b2931

Please sign in to comment.