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

Release 0.9.3 #1896

Merged
merged 12 commits into from
Oct 31, 2024
Merged
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- "master"
- "main"
paths:
- ".github/workflows/CI.yml"
- "examples/**"
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
conf:
- {
name: "gtk4",
features: "v4_16,xml_validation,blueprint",
features: "v4_18,xml_validation,blueprint",
test_sys: false,
}
- { name: "gsk4", features: "v4_14,broadway,vulkan", test_sys: true }
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
- uses: actions/checkout@v4
with:
repository: gtk-rs/checker
ref: master
ref: main
path: checker
- working-directory: checker
run: cargo build --release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/book-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: book
on:
push:
branches:
- "master"
- "main"
paths:
- "book/**"

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: docs

on:
push:
branches: [master]
branches: [main]
paths:
- ".github/workflows/docs.yml"
- "gdk4/**"
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- run: python3 ./generator.py --embed-docs --yes ./
- run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
- run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
- run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk4-rs/' --default-branch 'master' pre-docs | xargs)" >> ${GITHUB_ENV}
- run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk4-rs/' --default-branch 'main' pre-docs | xargs)" >> ${GITHUB_ENV}
env:
RUSTDOCFLAGS: >
--extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:

sed -i 's|section-tree-widget.html|https://docs.gtk.org/gtk4/section-tree-widget.html|g' target/doc/gtk4/struct.TreeView.html
- name: GTK Docs Images
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
run: |
git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk --no-checkout ./gtk-src
cd ./gtk-src
Expand All @@ -116,16 +116,16 @@ jobs:
git checkout main
mv ./docs/reference/gtk/images/*.png ../target/doc/gtk4
- name: Grab gtk-rs LOGO
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
run: |
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/favicon.svg
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/favicon.svg
- name: deploy
uses: peaceiris/actions-gh-pages@v4
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./target/doc/
Expand All @@ -135,7 +135,7 @@ jobs:
- run: python3 ./gir-rustdoc/gir-rustdoc.py --project-title 'GTK 4 Rust bindings' html-index --early-section 'Book' '<ul><li><a href="stable/latest/book">Latest stable</a></li></ul>'
- name: deploy index page
uses: peaceiris/actions-gh-pages@v4
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- cron: "0 1 * * 1"
push:
branches:
- "master"
- "main"
paths:
- "Dockerfile"
- ".github/workflows/image.yml"
Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
# set latest tag for master branch
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
# set latest tag for main branch
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}

- name: Build and push Docker image
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/listings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "book/listings/**"
push:
branches:
- "master"
- "main"
paths:
- "book/listings/**"
release:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: macOS

on:
push:
branches: [master]
branches: [main]
paths:
- ".github/workflows/macos.yml"
- "gdk4/**"
Expand Down Expand Up @@ -40,12 +40,12 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --features v4_14,xml_validation --manifest-path ./gtk4/Cargo.toml
args: --features v4_16,xml_validation --manifest-path ./gtk4/Cargo.toml
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features v4_14,xml_validation --manifest-path ./gtk4/Cargo.toml
args: --features v4_16,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
2 changes: 1 addition & 1 deletion .github/workflows/typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
jobs:
typos:
name: Spell Check with Typos
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 @@ -2,7 +2,7 @@ name: Windows MSVC

on:
push:
branches: [master]
branches: [main]
paths:
- ".github/workflows/windows-msvc.yml"
- "gdk4/**"
Expand Down Expand Up @@ -33,9 +33,9 @@ jobs:
id: cache
with:
path: c:/gnome
key: ${{ runner.os }}-gtk4-15.4
key: ${{ runner.os }}-gtk4-17.1
restore-keys: |
${{ runner.os }}-gtk4-15.4
${{ runner.os }}-gtk4-17.1

- name: Set up the PATH environment
run: |
Expand Down Expand Up @@ -94,17 +94,17 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --features v4_16,xml_validation
args: --features v4_18,xml_validation
- name: Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --features v4_16,xml_validation
args: --features v4_18,xml_validation
- name: Tests
uses: actions-rs/cargo@v1
with:
command: test
args: --features v4_16,xml_validation
args: --features v4_18,xml_validation

- name: Build gdk-win32
uses: actions-rs/cargo@v1
Expand Down
28 changes: 14 additions & 14 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ homepage = "https://gtk-rs.org/gtk4-rs"
license = "MIT"
repository = "https://github.com/gtk-rs/gtk4-rs"
rust-version = "1.70"
version = "0.9.2"
version = "0.9.3"

[workspace.dependencies]
cairo-sys-rs = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.20", branch = "0.20"}
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ A group of crates that aims to provide complete [GTK](https://gtk.org/) 4 bindin

The GTK 4 crates also depends on other libraries part of the platform like:

- [GLib](https://github.com/gtk-rs/gtk-rs-core/tree/master/glib)
- [Gio](https://github.com/gtk-rs/gtk-rs-core/tree/master/gio)
- [Graphene](https://github.com/gtk-rs/gtk-rs-core/tree/master/graphene)
- [Cairo](https://github.com/gtk-rs/gtk-rs-core/tree/master/cairo)
- [Pango](https://github.com/gtk-rs/gtk-rs-core/tree/master/pango)
- [GLib](https://github.com/gtk-rs/gtk-rs-core/tree/main/glib)
- [Gio](https://github.com/gtk-rs/gtk-rs-core/tree/main/gio)
- [Graphene](https://github.com/gtk-rs/gtk-rs-core/tree/main/graphene)
- [Cairo](https://github.com/gtk-rs/gtk-rs-core/tree/main/cairo)
- [Pango](https://github.com/gtk-rs/gtk-rs-core/tree/main/pango)

Those are common with the GTK 3 and GStreamer bindings and are part of the [gtk-rs-core](https://github.com/gtk-rs/gtk-rs-core) repository.

Expand All @@ -27,7 +27,7 @@ Currently, the minimum supported Rust version is `1.70`.

## Documentation

- [Examples](https://github.com/gtk-rs/gtk4-rs/tree/master/examples)
- [Examples](https://github.com/gtk-rs/gtk4-rs/tree/main/examples)
- Book [Stable](https://gtk-rs.org/gtk4-rs/stable/latest/book/)
- The Rust API [Stable](https://gtk-rs.org/gtk4-rs/stable/latest/docs/) / [Development](https://gtk-rs.org/gtk4-rs/git/docs/)

Expand Down Expand Up @@ -75,7 +75,7 @@ The bindings are composed of two parts:
- Automatically generated ones using [gir]
- Manual parts

The automatic ones can be generated using the [`generator.py`](https://github.com/gtk-rs/gir/blob/master/generator.py) script
The automatic ones can be generated using the [`generator.py`](https://github.com/gtk-rs/gir/blob/main/generator.py) script

```bash
python3 ./generator.py
Expand Down
2 changes: 1 addition & 1 deletion book/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title = "GUI development with Rust and GTK 4"

[output.html]
default-theme = "Rust"
git-repository-url = "https://github.com/gtk-rs/gtk4-rs/tree/master/book"
git-repository-url = "https://github.com/gtk-rs/gtk4-rs/tree/main/book"
git-repository-icon = "fa-github"
additional-css = ["theme/style.css"]
playground.runnable = false
Loading
Loading