Skip to content

Commit f6ccc4d

Browse files
committed
Update branch from master to main
1 parent f39b2b9 commit f6ccc4d

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: [master]
3+
branches: [main]
44
pull_request:
55
workflow_dispatch:
66

@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
with:
3838
repository: gtk-rs/checker
39-
ref: master
39+
ref: main
4040
path: checker
4141
if: matrix.rust == 'nightly'
4242
# nightly

.github/workflows/docs.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: [master]
3+
branches: [main]
44
pull_request:
55
workflow_dispatch:
66
release:
@@ -40,7 +40,7 @@ jobs:
4040
- run: cargo install rustdoc-stripper
4141
- run: python3 ./generator.py --embed-docs --yes ./
4242
- run: git clone https://gitlab.gnome.org/World/Rust/gir-rustdoc/ # checkout action doesn't support random urls
43-
- run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk-rs-core/' --default-branch 'master' pre-docs | xargs)" >> ${GITHUB_ENV}
43+
- run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk-rs-core/' --default-branch 'main' pre-docs | xargs)" >> ${GITHUB_ENV}
4444
- uses: actions-rs/cargo@v1
4545
with:
4646
command: doc
@@ -67,16 +67,16 @@ jobs:
6767
- run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)' | head -n1)" >> ${GITHUB_ENV}
6868
- run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
6969
- name: Grab gtk-rs LOGO
70-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
70+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
7171
run: |
72-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
73-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
74-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
75-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
76-
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/favicon.svg
72+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
73+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
74+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
75+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
76+
wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/favicon.svg
7777
7878
- name: deploy
79-
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
79+
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
8080
uses: peaceiris/actions-gh-pages@v4
8181
with:
8282
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -87,7 +87,7 @@ jobs:
8787
- run: python3 ./gir-rustdoc/gir-rustdoc.py --project-title 'GTK Core Rust bindings' html-index
8888
- name: deploy index page
8989
uses: peaceiris/actions-gh-pages@v4
90-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
90+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
9191
with:
9292
github_token: ${{ secrets.GITHUB_TOKEN }}
9393
publish_dir: ./public/

.github/workflows/image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- cron: '0 0 * * 1'
77
push:
88
branches:
9-
- "master"
9+
- "main"
1010
paths:
1111
- "Dockerfile"
1212
pull_request:

.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.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: [master]
3+
branches: [main]
44
pull_request:
55
workflow_dispatch:
66

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ $ git submodule update --checkout
5050

5151
## Development
5252

53-
This repository is mostly split into two branches: `master` and `crate`.
54-
`master` contains the not yet released code and is where new developments
55-
are happening. `crate` contains the last release source code and isn't supposed to
56-
be updated.
53+
This repository is mostly split into two branches: `main` and versioned
54+
branches, e.g. `0.20`. `main` contains the not yet released code and is where
55+
new developments are happening. `0.20` contains the last release source code
56+
of the 0.20 release branch.
5757

5858
This repository is structured as follows:
5959

examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Examples
22

3-
Consists of various examples of how to use the `gtk-rs-core` libraries. Note that there are other examples in [gtk3-rs](https://github.com/gtk-rs/gtk3-rs/tree/master/examples) & [gtk4-rs](https://github.com/gtk-rs/gtk4-rs/tree/master/examples) if you want GTK specific ones.
3+
Consists of various examples of how to use the `gtk-rs-core` libraries. Note that there are other examples in [gtk3-rs](https://github.com/gtk-rs/gtk3-rs/tree/master/examples) & [gtk4-rs](https://github.com/gtk-rs/gtk4-rs/tree/main/examples) if you want GTK specific ones.
44

55
- [GIO Async TLS](./gio_async_tls/)
66
- [GIO Futures](./gio_futures/)

gir-files

0 commit comments

Comments
 (0)