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.

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

Update dependencies #1717

Merged
merged 12 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ jobs:
conf:
- {
name: "gtk4",
features: "v4_14,xml_validation,blueprint",
features: "v4_16,xml_validation,blueprint",
test_sys: false,
}
- { name: "gsk4", features: "v4_14,broadway,vulkan", test_sys: true }
- { name: "gdk4", features: "v4_14,gl", test_sys: true }
- { name: "gdk4", features: "v4_16,gl", test_sys: true }
- {
name: "gdk4-wayland",
features: "v4_12,wayland_crate,egl",
test_sys: true,
}
- { name: "gdk4-x11", features: "v4_4,xlib,egl", test_sys: true }
- { name: "gdk4-x11", features: "v4_16,xlib,egl", test_sys: true }
- {
name: "gtk4-macros",
features: "xml_validation,blueprint",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --features v4_12,xml_validation --manifest-path ./gtk4/Cargo.toml
args: --features v4_14,xml_validation --manifest-path ./gtk4/Cargo.toml
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features v4_12,xml_validation --manifest-path ./gtk4/Cargo.toml
args: --features v4_14,xml_validation --manifest-path ./gtk4/Cargo.toml
# FIXME: renable once https://github.com/gtk-rs/gtk4-rs/issues/1235 is fixed
#- name: Tests
# uses: actions-rs/cargo@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/windows-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
id: cache
with:
path: c:/gnome
key: ${{ runner.os }}-gtk4-14.3
key: ${{ runner.os }}-gtk4-15.0
restore-keys: |
${{ runner.os }}-gtk4-14.3
${{ runner.os }}-gtk4-15.0

- name: Set up the PATH environment
run: |
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
working-directory: /gtk
if: steps.cache.outputs.cache-hit != 'true'
run: |
meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Ddemos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled
meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled

- name: Build and install GTK
working-directory: /gtk
Expand All @@ -94,17 +94,17 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --features v4_14,xml_validation
args: --features v4_16,xml_validation
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features v4_14,xml_validation
args: --features v4_16,xml_validation
- name: Tests
uses: actions-rs/cargo@v1
with:
command: test
args: --features v4_14,xml_validation
args: --features v4_16,xml_validation

- name: Build gdk-win32
uses: actions-rs/cargo@v1
Expand Down
Loading
Loading