diff --git a/.github/workflows/verify-publish.yaml b/.github/workflows/verify-publish.yaml index b8c199a..10c2718 100644 --- a/.github/workflows/verify-publish.yaml +++ b/.github/workflows/verify-publish.yaml @@ -2,7 +2,7 @@ on: pull_request: push: branches: - - main + - master name: Verify & Publish @@ -63,7 +63,7 @@ jobs: permissions: contents: write needs: [ verify ] - if: github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'chore(release):') + if: github.ref == 'refs/heads/master' && !startsWith(github.event.head_commit.message, 'chore(release):') runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -94,16 +94,16 @@ jobs: (cd src-tauri && jq ".package.version = \"$VERSION\"" tauri.conf.json > tauri.conf.json.tmp && mv tauri.conf.json.tmp tauri.conf.json) git commit --amend -am "chore(release): $VERSION" git tag -a v$VERSION -m "chore(release): $VERSION" - git push --follow-tags origin main + git push --follow-tags origin master git checkout develop git pull - git merge main + git merge master git push - git checkout main + git checkout master create-release: needs: [ verify, versioning ] - if: github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'chore(release):') + if: github.ref == 'refs/heads/master' && !startsWith(github.event.head_commit.message, 'chore(release):') permissions: contents: write runs-on: ubuntu-20.04 @@ -160,7 +160,7 @@ jobs: build-tauri: needs: create-release - if: github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'chore(release):') + if: github.ref == 'refs/heads/master' && !startsWith(github.event.head_commit.message, 'chore(release):') permissions: contents: write strategy: @@ -199,7 +199,7 @@ jobs: publish-release: permissions: contents: write - if: github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'chore(release):') + if: github.ref == 'refs/heads/master' && !startsWith(github.event.head_commit.message, 'chore(release):') runs-on: ubuntu-20.04 needs: [ create-release, build-tauri ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c1fcf3..e4693d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,40 +2,40 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [0.0.4](https://github.com/KyrillGobber/huehuehue/compare/v0.0.3...v0.0.4) (2023-07-07) +### [0.0.4](https://github.com/woollygoods/huehuehue/compare/v0.0.3...v0.0.4) (2023-07-07) ### Bug Fixes -* tag message ([417134a](https://github.com/KyrillGobber/huehuehue/commit/417134a1353539a1d73755527d8da1309965eb44)) +* tag message ([417134a](https://github.com/woollygoods/huehuehue/commit/417134a1353539a1d73755527d8da1309965eb44)) -### [0.0.3](https://github.com/KyrillGobber/huehuehue/compare/v0.0.2...v0.0.3) (2023-07-07) +### [0.0.3](https://github.com/woollygoods/huehuehue/compare/v0.0.2...v0.0.3) (2023-07-07) ### Bug Fixes -* switch to sveltekit ([8e6dd8c](https://github.com/KyrillGobber/huehuehue/commit/8e6dd8c0ecf4bd95f9af43421d1bdf4e183a6f8d)) +* switch to sveltekit ([8e6dd8c](https://github.com/woollygoods/huehuehue/commit/8e6dd8c0ecf4bd95f9af43421d1bdf4e183a6f8d)) -### [0.0.2](https://github.com/KyrillGobber/huehuehue/compare/v0.0.1...v0.0.2) (2023-07-01) +### [0.0.2](https://github.com/woollygoods/huehuehue/compare/v0.0.1...v0.0.2) (2023-07-01) ### Features -* Added custom colors and tailwind-scrollbar ([b072b1c](https://github.com/KyrillGobber/huehuehue/commit/b072b1c364f127edb0d1fdd2c09555886a06ba46)) -* Added folder setup + styling features ([7154d75](https://github.com/KyrillGobber/huehuehue/commit/7154d757056ff0bdaf01e28916d6bba71c155d89)) -* Added new app icons (testing macos) ([a9e115a](https://github.com/KyrillGobber/huehuehue/commit/a9e115a1833cee90b5615229940675aac612e36e)) +* Added custom colors and tailwind-scrollbar ([b072b1c](https://github.com/woollygoods/huehuehue/commit/b072b1c364f127edb0d1fdd2c09555886a06ba46)) +* Added folder setup + styling features ([7154d75](https://github.com/woollygoods/huehuehue/commit/7154d757056ff0bdaf01e28916d6bba71c155d89)) +* Added new app icons (testing macos) ([a9e115a](https://github.com/woollygoods/huehuehue/commit/a9e115a1833cee90b5615229940675aac612e36e)) ### 0.0.1 (2023-06-24) ### Features -* Better launch scripts ([eed9851](https://github.com/KyrillGobber/huehuehue/commit/eed98515f79e58cc553fe023f790b05ed94d5b33)) -* Initial commit ([241eb5d](https://github.com/KyrillGobber/huehuehue/commit/241eb5d71d65804d92cba279fe34fc36a65bd7ad)) -* Renamed "tauri-app" to "huehuehue" ([d26702b](https://github.com/KyrillGobber/huehuehue/commit/d26702bd994fac5ca4256a1316a0c89adec3bf47)) +* Better launch scripts ([eed9851](https://github.com/woollygoods/huehuehue/commit/eed98515f79e58cc553fe023f790b05ed94d5b33)) +* Initial commit ([241eb5d](https://github.com/woollygoods/huehuehue/commit/241eb5d71d65804d92cba279fe34fc36a65bd7ad)) +* Renamed "tauri-app" to "huehuehue" ([d26702b](https://github.com/woollygoods/huehuehue/commit/d26702bd994fac5ca4256a1316a0c89adec3bf47)) ### Bug Fixes -* Changed default identifier for builds ([f72234c](https://github.com/KyrillGobber/huehuehue/commit/f72234c9720c315b37cb06885b47a352e96dd3f9)) -* removed greet ([f2392fb](https://github.com/KyrillGobber/huehuehue/commit/f2392fbc6e0c72a9f920248c5cbc6463d744bda7)) +* Changed default identifier for builds ([f72234c](https://github.com/woollygoods/huehuehue/commit/f72234c9720c315b37cb06885b47a352e96dd3f9)) +* removed greet ([f2392fb](https://github.com/woollygoods/huehuehue/commit/f2392fbc6e0c72a9f920248c5cbc6463d744bda7)) diff --git a/README.md b/README.md index b4c20d7..815a613 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ [![Build Status][action-badge]][action-url] [![Crate Coverage][coverage-badge]][coverage-url] -[action-badge]: https://img.shields.io/github/actions/workflow/status/KyrillGobber/huehuehue/verify-publish.yaml?branch=main&label=build&logo=github&style=flat-square -[action-url]: https://github.com/KyrillGobber/huehuehue/actions/workflows/verify-publish.yaml -[coverage-badge]: https://img.shields.io/codecov/c/github/KyrillGobber/huehuehue?logo=codecov&logoColor=white&style=flat-square -[coverage-url]: https://app.codecov.io/gh/KyrillGobber/huehuehue +[action-badge]: https://img.shields.io/github/actions/workflow/status/woollygoods/huehuehue/verify-publish.yaml?branch=master&label=build&logo=github&style=flat-square +[action-url]: https://github.com/woollygoods/huehuehue/actions/workflows/verify-publish.yaml +[coverage-badge]: https://img.shields.io/codecov/c/github/woollygoods/huehuehue?logo=codecov&logoColor=white&style=flat-square +[coverage-url]: https://app.codecov.io/gh/woollygoods/huehuehue # Tauri + Svelte + Typescript diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 008f522..d32610a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Cedric Schwyter ", ] license = "" -repository = "https://github.com/KyrillGobber/huehuehue" +repository = "https://github.com/woollygoods/huehuehue" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html