Skip to content

Commit 2153716

Browse files
committed
Update branch from master to main
1 parent b01dd6b commit 2153716

35 files changed

+437
-456
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/**"
@@ -62,7 +62,7 @@ jobs:
6262
- run: python3 ./generator.py --embed-docs --yes ./
6363
- run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
6464
- run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
65-
- 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}
65+
- 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}
6666
env:
6767
RUSTDOCFLAGS: >
6868
--extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
@@ -108,7 +108,7 @@ jobs:
108108
109109
sed -i 's|section-tree-widget.html|https://docs.gtk.org/gtk4/section-tree-widget.html|g' target/doc/gtk4/struct.TreeView.html
110110
- name: GTK Docs Images
111-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
111+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
112112
run: |
113113
git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk --no-checkout ./gtk-src
114114
cd ./gtk-src
@@ -117,16 +117,16 @@ jobs:
117117
git checkout main
118118
mv ./docs/reference/gtk/images/*.png ../target/doc/gtk4
119119
- name: Grab gtk-rs LOGO
120-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
120+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
121121
run: |
122-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
123-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
124-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
125-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
126-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/favicon.svg
122+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
123+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
124+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
125+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
126+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/favicon.svg
127127
- name: deploy
128128
uses: peaceiris/actions-gh-pages@v4
129-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
129+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
130130
with:
131131
github_token: ${{ secrets.GITHUB_TOKEN }}
132132
publish_dir: ./target/doc/
@@ -136,7 +136,7 @@ jobs:
136136
- 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>'
137137
- name: deploy index page
138138
uses: peaceiris/actions-gh-pages@v4
139-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
139+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
140140
with:
141141
github_token: ${{ secrets.GITHUB_TOKEN }}
142142
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@4f58ea79222b3b9dc2c8bbdd6debcef730109a75

.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/**"

0 commit comments

Comments
 (0)