diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index 810fede66e..cb47aa0dda 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -58,6 +58,6 @@ body: label: Are you willing to submit a PR? description: > (Optional) We encourage you to submit a [Pull Request](https://github.com/toeverything/affine/pulls) (PR) to help improve AFFiNE for everyone, especially if you have a good understanding of how to implement a fix or feature. - See the AFFiNE [Contributing Guide](https://github.com/toeverything/affine/blob/master/CONTRIBUTING.md) to get started. + See the AFFiNE [Contributing Guide](https://github.com/toeverything/affine/blob/canary/CONTRIBUTING.md) to get started. options: - label: Yes I'd like to help by submitting a PR! diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml index 86f21963ed..f9cd162291 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml @@ -31,6 +31,6 @@ body: label: Are you willing to submit a PR? description: > (Optional) We encourage you to submit a [Pull Request](https://github.com/toeverything/affine/pulls) (PR) to help improve AFFiNE for everyone, especially if you have a good understanding of how to implement a fix or feature. - See the AFFiNE [Contributing Guide](https://github.com/toeverything/affine/blob/master/CONTRIBUTING.md) to get started. + See the AFFiNE [Contributing Guide](https://github.com/toeverything/affine/blob/canary/CONTRIBUTING.md) to get started. options: - label: Yes I'd like to help by submitting a PR! diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 2ffbfbcb6a..74e97bf56a 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -3,7 +3,7 @@ name: Build(Desktop) & Test on: push: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: @@ -15,7 +15,7 @@ on: pull_request: merge_group: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: diff --git a/.github/workflows/build-server.yml b/.github/workflows/build-server.yml index d444a4dd4e..9fb88605c4 100644 --- a/.github/workflows/build-server.yml +++ b/.github/workflows/build-server.yml @@ -3,7 +3,7 @@ name: Build(Server) & Test on: push: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: @@ -15,7 +15,7 @@ on: pull_request: merge_group: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33d84dc1a9..9bd2266a4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Build & Test on: push: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: @@ -15,7 +15,7 @@ on: pull_request: merge_group: branches: - - master + - canary - v[0-9]+.[0-9]+.x-staging - v[0-9]+.[0-9]+.x paths-ignore: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bb6e448b7a..3e219c0dce 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,11 +13,11 @@ name: 'CodeQL' on: push: - branches: [master] + branches: [canary] pull_request: merge_group: # The branches below must be a subset of the branches above - branches: [master] + branches: [canary] jobs: analyze: diff --git a/.github/workflows/helm-releaser.yml b/.github/workflows/helm-releaser.yml index 72eeb05ebd..ed1f48ad53 100644 --- a/.github/workflows/helm-releaser.yml +++ b/.github/workflows/helm-releaser.yml @@ -2,7 +2,7 @@ name: Release Charts on: push: - branches: [master] + branches: [canary] paths: - '.github/helm/**/Chart.yml' diff --git a/.github/workflows/label-checker.yml b/.github/workflows/label-checker.yml index c60d676cae..8138ccdce9 100644 --- a/.github/workflows/label-checker.yml +++ b/.github/workflows/label-checker.yml @@ -6,7 +6,7 @@ on: - labeled - unlabeled branches: - - master + - canary jobs: check_labels: diff --git a/.github/workflows/languages-sync.yml b/.github/workflows/languages-sync.yml index 8ef8cc9aa6..073cf20813 100644 --- a/.github/workflows/languages-sync.yml +++ b/.github/workflows/languages-sync.yml @@ -2,13 +2,13 @@ name: Languages Sync on: push: - branches: ['master'] + branches: ['canary'] paths: - 'packages/frontend/i18n/**' - '.github/workflows/languages-sync.yml' - '!.github/actions/setup-node/action.yml' pull_request_target: - branches: ['master'] + branches: ['canary'] paths: - 'packages/frontend/i18n/**' - '.github/workflows/languages-sync.yml' @@ -23,13 +23,13 @@ jobs: - name: Setup Node.js uses: ./.github/actions/setup-node - name: Check Language Key - if: github.ref != 'refs/heads/master' + if: github.ref != 'refs/heads/canary' run: yarn workspace @affine/i18n run sync-languages:check env: TOLGEE_API_KEY: ${{ secrets.TOLGEE_API_KEY }} - name: Sync Languages - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/canary' run: yarn workspace @affine/i18n run sync-languages env: TOLGEE_API_KEY: ${{ secrets.TOLGEE_API_KEY }} diff --git a/.github/workflows/pr-title-lint.yml b/.github/workflows/pr-title-lint.yml index 5632c82f38..75ecb019bf 100644 --- a/.github/workflows/pr-title-lint.yml +++ b/.github/workflows/pr-title-lint.yml @@ -7,7 +7,7 @@ on: - edited - synchronize branches: - - master + - canary permissions: contents: read diff --git a/.github/workflows/publish-storybook.yml b/.github/workflows/publish-storybook.yml index ca8745ab69..166e795196 100644 --- a/.github/workflows/publish-storybook.yml +++ b/.github/workflows/publish-storybook.yml @@ -7,10 +7,10 @@ on: workflow_dispatch: push: branches: - - master + - canary pull_request: branches: - - master + - canary paths-ignore: - README.md - .github/** diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fd95b15a6..bbaac8305c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - master + - canary env: BUILD_TYPE: stable @@ -89,7 +89,7 @@ jobs: if-no-files-found: error build-docker: - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/canary' name: Build Docker runs-on: ubuntu-latest needs: diff --git a/.github/workflows/workers.yml b/.github/workflows/workers.yml index bf4b131b00..b51fc50926 100644 --- a/.github/workflows/workers.yml +++ b/.github/workflows/workers.yml @@ -3,7 +3,7 @@ name: Deploy Cloudflare Worker on: push: branches: - - master + - canary paths: - tools/workers/** diff --git a/README.md b/README.md index bc3c4dad59..73caf09e83 100644 --- a/README.md +++ b/README.md @@ -220,10 +220,10 @@ See [LICENSE] for details. [update page]: https://affine.pro/blog?tag=Release%20Note [jobs available]: ./docs/jobs.md [latest packages]: https://github.com/toeverything/AFFiNE/pkgs/container/affine-self-hosted -[contributor license agreement]: https://github.com/toeverything/affine/edit/master/.github/CLA.md +[contributor license agreement]: https://github.com/toeverything/affine/edit/canary/.github/CLA.md [rust-version-icon]: https://img.shields.io/badge/Rust-1.71.0-dea584 [stars-icon]: https://img.shields.io/github/stars/toeverything/AFFiNE.svg?style=flat&logo=github&colorB=red&label=stars -[codecov]: https://codecov.io/gh/toeverything/affine/branch/master/graphs/badge.svg?branch=master +[codecov]: https://codecov.io/gh/toeverything/affine/branch/canary/graphs/badge.svg?branch=canary [node-version-icon]: https://img.shields.io/badge/node-%3E=18.16.1-success [typescript-version-icon]: https://img.shields.io/github/package-json/dependency-version/toeverything/affine/dev/typescript [react-version-icon]: https://img.shields.io/github/package-json/dependency-version/toeverything/AFFiNE/react?filename=packages%2Ffrontend%2Fcore%2Fpackage.json&color=rgb(97%2C228%2C251) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index b611799abf..44cd1265a5 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -13,7 +13,7 @@ Use the table of contents icon on the top left corner of this document to get to Currently we have two versions of AFFiNE: - [AFFiNE Pre-Alpha](https://livedemo.affine.pro/). This version uses the branch `Pre-Alpha`, it is no longer actively developed but contains some different functions and features. -- [AFFiNE Alpha](https://pathfinder.affine.pro/). This version uses the `master` branch, this is the latest version under active development. +- [AFFiNE Alpha](https://pathfinder.affine.pro/). This version uses the `canary` branch, this is the latest version under active development. To get an overview of the project, read the [README](../README.md). Here are some resources to help you get started with open source contributions: diff --git a/docs/contributing/releases.md b/docs/contributing/releases.md index f0c3480e63..1e2b5ee2fc 100644 --- a/docs/contributing/releases.md +++ b/docs/contributing/releases.md @@ -11,7 +11,7 @@ The AFFiNE core team gives release authorization. And also have the following re ## How to make a release? -Before releasing, ensure you have the latest version of the `master` branch. +Before releasing, ensure you have the latest version of the `canary` branch. And Read the semver specification to understand how to version your release. https://semver.org @@ -21,13 +21,13 @@ And Read the semver specification to understand how to version your release. htt ./scripts/set-version.sh 0.5.4-canary.5 ``` -### 2. Commit changes and push to `master` +### 2. Commit changes and push to `canary` ```shell git add . # vx.y.z-canary.n git commit -m "v0.5.4-canary.5" -git push origin master +git push origin canary ``` ### 3. Create a release action diff --git a/nx.json b/nx.json index 7835c08f79..da98371a7a 100644 --- a/nx.json +++ b/nx.json @@ -11,7 +11,7 @@ } }, "affected": { - "defaultBase": "master" + "defaultBase": "canary" }, "namedInputs": { "default": ["{projectRoot}/**/*", "sharedGlobals"], diff --git a/package.json b/package.json index ed989c6ffb..f84b3fedba 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "test": "vitest --run", "test:ui": "vitest --ui", "test:coverage": "vitest run --coverage", - "notify": "node scripts/notify.mjs", "circular": "madge --circular --ts-config ./tsconfig.json ./packages/frontend/core/src/pages/**/*.tsx ./packages/frontend/core/src/index.tsx ./packages/frontend/electron/src/*/index.ts", "typecheck": "tsc -b tsconfig.json --diagnostics", "postinstall": "node ./scripts/check-version.mjs && yarn i18n-codegen gen && yarn husky install" diff --git a/packages/common/y-indexeddb/README.md b/packages/common/y-indexeddb/README.md index 7c618c007f..6b5833c78f 100644 --- a/packages/common/y-indexeddb/README.md +++ b/packages/common/y-indexeddb/README.md @@ -35,4 +35,4 @@ downloadBinary(yDoc.guid).then(blob => { ## LICENSE -[MIT](https://github.com/toeverything/AFFiNE/blob/master/LICENSE-MIT) +[MIT](https://github.com/toeverything/AFFiNE/blob/canary/LICENSE-MIT) diff --git a/scripts/notify.mjs b/scripts/notify.mjs deleted file mode 100644 index a475261fb4..0000000000 --- a/scripts/notify.mjs +++ /dev/null @@ -1,20 +0,0 @@ -const STAGE_HOST = 'https://nightly.affine.pro/'; -if (['master', 'develop'].includes(process.env.CF_PAGES_BRANCH)) { - const message = `Daily builds: New deployment of version ${process.env.CF_PAGES_COMMIT_SHA} was deploy: [nightly](${STAGE_HOST}) / [internal](${process.env.CF_PAGES_URL})`; - const url = `https://api.telegram.org/bot${process.env.BOT_TOKEN}/sendMessage`; - - fetch(url, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - chat_id: process.env.CHAT_ID, - text: message, - parse_mode: 'Markdown', - disable_notification: true, - }), - }) - .then(r => r.json()) - .then(console.log); -} diff --git a/tests/storybook/src/stories/introduction.stories.mdx b/tests/storybook/src/stories/introduction.stories.mdx index e4b88447ad..3dba2ebe1c 100644 --- a/tests/storybook/src/stories/introduction.stories.mdx +++ b/tests/storybook/src/stories/introduction.stories.mdx @@ -15,4 +15,4 @@ If you find a bug, please file an issue on [GitHub](https://github.com/toeveryth ## Contributing -We welcome contributions from the community! [Get started here](https://github.com/toeverything/AFFiNE/blob/master/docs/BUILDING.md) +We welcome contributions from the community! [Get started here](https://github.com/toeverything/AFFiNE/blob/canary/docs/BUILDING.md)