Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mac ci #131

Merged
merged 2 commits into from
Dec 24, 2024
Merged

Fix mac ci #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
724d9d1
ci: Fix macOS build
philn Dec 24, 2024
2263f7b
ci: Bump linux container to Fedora 41
philn Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@ jobs:
run: |
sudo apt update
sudo apt-get -y install podman
podman pull fedora:40
podman pull fedora:41
- uses: actions/checkout@v3
- name: Create container
run: |
podman build --tag fedora40test -f ./Dockerfile
podman build --tag fedora41test -f ./Dockerfile
- name: rustfmt
run: cargo fmt -- --check
- name: Build
run: |
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora40test /root/.cargo/bin/cargo build --verbose
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora41test /root/.cargo/bin/cargo build --verbose
- name: Annotate commit with clippy warnings
run: |
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora40test /root/.cargo/bin/cargo clippy -- -D warnings
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora41test /root/.cargo/bin/cargo clippy -- -D warnings
- name: Security audit
uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run tests
run: |
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora40test /root/.cargo/bin/cargo test --verbose
podman run -v $PWD:/workspace -w /workspace --privileged -it fedora41test /root/.cargo/bin/cargo test --verbose
macos-build:
runs-on: macos-latest
steps:
Expand All @@ -48,7 +48,6 @@ jobs:
brew update
brew upgrade || true
brew install pkg-config pango gtk+4 libadwaita gstreamer || true
brew link --overwrite [email protected]
- name: Build
run: cargo build --verbose
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:40
FROM fedora:41

RUN dnf update -y
RUN dnf install -y gcc git wget gtk4-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel libadwaita-devel
Expand Down
Loading