Skip to content

Commit

Permalink
Merge pull request #1477 from sdroege/0.20-backports
Browse files Browse the repository at this point in the history
0.20 backports
  • Loading branch information
sdroege authored Aug 12, 2024
2 parents 32b170c + 74b6ed4 commit 812c70f
Show file tree
Hide file tree
Showing 42 changed files with 904 additions and 247 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2

generator:
name: regen check
Expand Down
130 changes: 59 additions & 71 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ rust-version = "1.70"
[workspace.dependencies]
libc = "0.2"
bitflags = "2.6"
thiserror = "1"
gir-format-check = "^0.1"
glib-sys = { path = "glib/sys", version = "0.20" }
gobject-sys = { path = "glib/gobject-sys", version = "0.20" }
Expand Down
1 change: 0 additions & 1 deletion cairo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ workspace = true
cairo-sys-rs.workspace = true
libc.workspace = true
bitflags.workspace = true
thiserror.workspace = true
freetype-rs = { version = "0.37", optional = true }

[dev-dependencies]
Expand Down
Loading

0 comments on commit 812c70f

Please sign in to comment.