From 390df241de42784c37400517cade1da1027b82ce Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Fri, 7 Apr 2023 13:21:23 -0400 Subject: [PATCH] fix(cicd): forgot to change the refs to master in code --- .github/workflows/ci.yml | 6 +++--- .gitignore | 2 +- data/io.github.mightycreak.Diffuse.appdata.xml.in | 4 ++-- docs/developers/release-process.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce006d0..96af8d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,11 +2,11 @@ name: CI # Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the master branch + # Triggers the workflow on push or pull request events but only for the default branch push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.gitignore b/.gitignore index e78553e..ba41b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # -# Source: https://github.com/github/gitignore/blob/master/Python.gitignore +# Source: https://github.com/github/gitignore/blob/main/Python.gitignore # # Byte-compiled / optimized / DLL files diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index 77b21b9..0e8a480 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -23,11 +23,11 @@ - https://github.com/MightyCreak/diffuse/raw/master/docs/images/screenshot_v0.7.7_main_window.png + https://github.com/MightyCreak/diffuse/raw/main/docs/images/screenshot_v0.7.7_main_window.png Main window - https://github.com/MightyCreak/diffuse/raw/master/docs/images/screenshot_v0.7.7_about_window.png + https://github.com/MightyCreak/diffuse/raw/main/docs/images/screenshot_v0.7.7_about_window.png About window diff --git a/docs/developers/release-process.md b/docs/developers/release-process.md index 60f91f6..cb33063 100644 --- a/docs/developers/release-process.md +++ b/docs/developers/release-process.md @@ -39,19 +39,19 @@ few manual steps. - Release title: the tag (e.g. `v1.2.3`) - Description: - For the first paragraph, paste the first paragraph from the release notes - - For the second paragraph, got to [CHANGELOG.md](https://github.com/MightyCreak/diffuse/blob/master/CHANGELOG.md) + - For the second paragraph, got to [CHANGELOG.md](https://github.com/MightyCreak/diffuse/blob/main/CHANGELOG.md) and copy the URL anchor to the new release, then add this sentence (adapt the changelog link): > For a more detailed list of changes, see the - > [changelog](https://github.com/MightyCreak/diffuse/blob/master/CHANGELOG.md#xyz---yyyy-mm-dd). + > [changelog](https://github.com/MightyCreak/diffuse/blob/main/CHANGELOG.md#xyz---yyyy-mm-dd). 3. Publish release ## Create new release on Flatpak -1. Clone the Flathub repository: https://github.com/flathub/io.github.mightycreak.Diffuse +1. Clone the Flathub repository: 2. Copy the contents of Diffuse's `io.github.mightycreak.Diffuse.yml` to Flathub's 3. Keep Flathub's `config-opts` and `sources` sections 4. In `sources` section, change the `commit` and `tag` 5. Create commit with changes and push to `master` -6. Check the build on Flathub: https://flathub.org/builds/ +6. Check the build on Flathub: 7. When it's done and successful, publish the build