Skip to content

Commit e6ed2e3

Browse files
Switch to main branch
1 parent 70dbf1d commit e6ed2e3

31 files changed

+232
-232
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
branches:
4-
- "master"
4+
- "main"
55
paths:
66
- ".github/workflows/CI.yml"
77
- "examples/**"
@@ -175,7 +175,7 @@ jobs:
175175
- uses: actions/checkout@v4
176176
with:
177177
repository: gtk-rs/checker
178-
ref: master
178+
ref: main
179179
path: checker
180180
- working-directory: checker
181181
run: cargo build --release

.github/workflows/book-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: book
33
on:
44
push:
55
branches:
6-
- "master"
6+
- "main"
77
paths:
88
- "book/**"
99

.github/workflows/docs.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: docs
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
paths:
77
- ".github/workflows/docs.yml"
88
- "gdk4/**"
@@ -61,7 +61,7 @@ jobs:
6161
- run: python3 ./generator.py --embed-docs --yes ./
6262
- run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
6363
- run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
64-
- 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}
64+
- 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}
6565
env:
6666
RUSTDOCFLAGS: >
6767
--extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
@@ -107,7 +107,7 @@ jobs:
107107
108108
sed -i 's|section-tree-widget.html|https://docs.gtk.org/gtk4/section-tree-widget.html|g' target/doc/gtk4/struct.TreeView.html
109109
- name: GTK Docs Images
110-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
110+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
111111
run: |
112112
git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk --no-checkout ./gtk-src
113113
cd ./gtk-src
@@ -116,16 +116,16 @@ jobs:
116116
git checkout main
117117
mv ./docs/reference/gtk/images/*.png ../target/doc/gtk4
118118
- name: Grab gtk-rs LOGO
119-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
119+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
120120
run: |
121-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
122-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
123-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
124-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
125-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/favicon.svg
121+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
122+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
123+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
124+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
125+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/favicon.svg
126126
- name: deploy
127127
uses: peaceiris/actions-gh-pages@v4
128-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
128+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
129129
with:
130130
github_token: ${{ secrets.GITHUB_TOKEN }}
131131
publish_dir: ./target/doc/
@@ -135,7 +135,7 @@ jobs:
135135
- 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>'
136136
- name: deploy index page
137137
uses: peaceiris/actions-gh-pages@v4
138-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
138+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
139139
with:
140140
github_token: ${{ secrets.GITHUB_TOKEN }}
141141
publish_dir: ./public/

.github/workflows/image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- cron: "0 1 * * 1"
77
push:
88
branches:
9-
- "master"
9+
- "main"
1010
paths:
1111
- "Dockerfile"
1212
- ".github/workflows/image.yml"
@@ -41,8 +41,8 @@ jobs:
4141
with:
4242
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4343
tags: |
44-
# set latest tag for master branch
45-
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
44+
# set latest tag for main branch
45+
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
4646
4747
- name: Build and push Docker image
4848
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c

.github/workflows/listings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "book/listings/**"
77
push:
88
branches:
9-
- "master"
9+
- "main"
1010
paths:
1111
- "book/listings/**"
1212
release:

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: macOS
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
paths:
77
- ".github/workflows/macos.yml"
88
- "gdk4/**"

.github/workflows/typos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- "master"
6+
- "main"
77
jobs:
88
typos:
99
name: Spell Check with Typos

.github/workflows/windows-msvc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Windows MSVC
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
paths:
77
- ".github/workflows/windows-msvc.yml"
88
- "gdk4/**"

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ A group of crates that aims to provide complete [GTK](https://gtk.org/) 4 bindin
1111

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

14-
- [GLib](https://github.com/gtk-rs/gtk-rs-core/tree/master/glib)
15-
- [Gio](https://github.com/gtk-rs/gtk-rs-core/tree/master/gio)
16-
- [Graphene](https://github.com/gtk-rs/gtk-rs-core/tree/master/graphene)
17-
- [Cairo](https://github.com/gtk-rs/gtk-rs-core/tree/master/cairo)
18-
- [Pango](https://github.com/gtk-rs/gtk-rs-core/tree/master/pango)
14+
- [GLib](https://github.com/gtk-rs/gtk-rs-core/tree/main/glib)
15+
- [Gio](https://github.com/gtk-rs/gtk-rs-core/tree/main/gio)
16+
- [Graphene](https://github.com/gtk-rs/gtk-rs-core/tree/main/graphene)
17+
- [Cairo](https://github.com/gtk-rs/gtk-rs-core/tree/main/cairo)
18+
- [Pango](https://github.com/gtk-rs/gtk-rs-core/tree/main/pango)
1919

2020
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.
2121

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

2828
## Documentation
2929

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

@@ -75,7 +75,7 @@ The bindings are composed of two parts:
7575
- Automatically generated ones using [gir]
7676
- Manual parts
7777

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

8080
```bash
8181
python3 ./generator.py

book/book.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title = "GUI development with Rust and GTK 4"
88

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

0 commit comments

Comments
 (0)