From 21ad2ec73664c6bc1609d7f4c2c1ac99d79b089e Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 18 Apr 2024 11:50:16 +0200 Subject: [PATCH] Fix for recent rename of `master` branch to `main` --- .github/workflows/pages.yml | 4 ++-- README.md | 2 +- src/app.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 9190f84d..0765d017 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -1,10 +1,10 @@ name: Github Pages -# By default, runs if you push to master. keeps your deployed app in sync with master branch. +# By default, runs if you push to main. keeps your deployed app in sync with main branch. on: push: branches: - - master + - main # to only run when you do a new github release, comment out above part and uncomment the below trigger. # on: # release: diff --git a/README.md b/README.md index 52f21466..d9ea195f 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ We use [Trunk](https://trunkrs.dev/) to build for web target. > > If `gh-pages` is not available in `Source`, just create and push a branch called `gh-pages` and it should be available. > -> If you renamed the `master` branch to something else (say you re-initialized the repository with `main` as the initial branch), be sure to edit the github workflows `.github/workflows/pages.yml` file to reflect the change +> If you renamed the `main` branch to something else (say you re-initialized the repository with `master` as the initial branch), be sure to edit the github workflows `.github/workflows/pages.yml` file to reflect the change > ```yml > on: > push: diff --git a/src/app.rs b/src/app.rs index 18dd2597..24bbc622 100644 --- a/src/app.rs +++ b/src/app.rs @@ -82,7 +82,7 @@ impl eframe::App for TemplateApp { ui.separator(); ui.add(egui::github_link_file!( - "https://github.com/emilk/eframe_template/blob/master/", + "https://github.com/emilk/eframe_template/blob/main/", "Source code." )); @@ -102,7 +102,7 @@ fn powered_by_egui_and_eframe(ui: &mut egui::Ui) { ui.label(" and "); ui.hyperlink_to( "eframe", - "https://github.com/emilk/egui/tree/master/crates/eframe", + "https://github.com/emilk/egui/tree/main/crates/eframe", ); ui.label("."); });