From 8d4bc84ca6dbbe4c9640f1a0062fffb407a52599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 22 Oct 2024 13:13:36 +0300 Subject: [PATCH] Update branch from master to main --- .github/workflows/CI.yml | 4 ++-- .github/workflows/docs.yml | 20 ++++++++++---------- .github/workflows/image.yml | 2 +- .github/workflows/typos.yml | 2 +- .github/workflows/windows.yml | 2 +- README.md | 8 ++++---- examples/README.md | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 21ba5d6d8ee9..dd97c7edb128 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,6 +1,6 @@ on: push: - branches: [master] + branches: [main] pull_request: workflow_dispatch: @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v4 with: repository: gtk-rs/checker - ref: master + ref: main path: checker if: matrix.rust == 'nightly' # nightly diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 29819b13d65d..80ef9dcfb975 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,6 +1,6 @@ on: push: - branches: [master] + branches: [main] pull_request: workflow_dispatch: release: @@ -40,7 +40,7 @@ jobs: - run: cargo install rustdoc-stripper - run: python3 ./generator.py --embed-docs --yes ./ - run: git clone https://gitlab.gnome.org/World/Rust/gir-rustdoc/ # checkout action doesn't support random urls - - 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} + - 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} - uses: actions-rs/cargo@v1 with: command: doc @@ -67,16 +67,16 @@ jobs: - 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} - 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 - 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' }} uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -87,7 +87,7 @@ jobs: - run: python3 ./gir-rustdoc/gir-rustdoc.py --project-title 'GTK Core Rust bindings' html-index - 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/ diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 9c4e2968b7ea..e54645692802 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -6,7 +6,7 @@ on: - cron: '0 0 * * 1' push: branches: - - "master" + - "main" paths: - "Dockerfile" pull_request: diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml index 74d258d93f7a..24309da9ec8e 100644 --- a/.github/workflows/typos.yml +++ b/.github/workflows/typos.yml @@ -3,7 +3,7 @@ on: pull_request: push: branches: - - "master" + - "main" jobs: typos: name: Spell Check with Typos diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d6c179fa627e..7090d8889e43 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,6 +1,6 @@ on: push: - branches: [master] + branches: [main] pull_request: workflow_dispatch: diff --git a/README.md b/README.md index 71f6bb85d859..b8b9719300dd 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,10 @@ $ git submodule update --checkout ## Development -This repository is mostly split into two branches: `master` and `crate`. -`master` contains the not yet released code and is where new developments -are happening. `crate` contains the last release source code and isn't supposed to -be updated. +This repository is mostly split into two branches: `main` and versioned +branches, e.g. `0.20`. `main` contains the not yet released code and is where +new developments are happening. `0.20` contains the last release source code +of the 0.20 release branch. This repository is structured as follows: diff --git a/examples/README.md b/examples/README.md index ff30a3c647a2..1ff26cb3a840 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,6 +1,6 @@ # Examples -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. +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. - [GIO Async TLS](./gio_async_tls/) - [GIO Futures](./gio_futures/)