diff --git a/.appveyor.yml b/.appveyor.yml index 5dc483e0..9d0bf2f5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -80,7 +80,8 @@ for: - branches: only: - - master + - dev + - stable - skip_non_tags: true diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3ab3426b..789e1def 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -3,14 +3,16 @@ name: Cutter CI on: push: branches: - - master + - dev + - stable tags: - v* - upload-test* pull_request: branches: - - master + - dev + - stable jobs: build: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 41645177..a423c001 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Docs on: push: branches: - - master + - dev jobs: deploy: diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 3f516b2e..dfe70b68 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -3,10 +3,12 @@ name: "Linter" on: push: branches: - - master + - dev + - stable pull_request: branches: - - master + - dev + - stable jobs: changes: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61f1ecf9..cf9ebb07 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Please follow our contribution guidelines: https://cutter.re/docs/contributing.h ## Contributing to the documentation -The documentation is something important for newcomers. As of today the documentation can be found [here](https://cutter.re/docs/) and it stands in the [docs](https://github.com/rizinorg/cutter/tree/master/docs) folder. +The documentation is something important for newcomers. As of today the documentation can be found [here](https://cutter.re/docs/) and it stands in the [docs](docs) folder. The API Reference is automatically generated from the source code, so it is strongly advised to document your code. Check issues marked as "Documentation" on our issues [list](https://github.com/rizinorg/cutter/issues?q=is%3Aissue+is%3Aopen+label%3ADocumentation). diff --git a/README.md b/README.md index 5c1e71ee..4962b466 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -Cutter logo +Cutter logo # Cutter Cutter is a free and open-source reverse engineering platform powered by [rizin](https://github.com/rizinorg/rizin). It aims at being an advanced and customizable reverse engineering platform while keeping the user experience in mind. Cutter is created by reverse engineers for reverse engineers. [![Cutter CI](https://github.com/rizinorg/cutter/workflows/Cutter%20CI/badge.svg)](https://github.com/rizinorg/cutter/actions?query=workflow%3A%22Cutter+CI%22) -[![Build status](https://ci.appveyor.com/api/projects/status/tn7kttv55b8wf799/branch/master?svg=true)](https://ci.appveyor.com/project/rizinorg/cutter/branch/master) +[![Build status](https://ci.appveyor.com/api/projects/status/tn7kttv55b8wf799/branch/dev?svg=true)](https://ci.appveyor.com/project/rizinorg/cutter/branch/dev) [![Total alerts](https://img.shields.io/lgtm/alerts/g/rizinorg/cutter.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rizinorg/cutter/alerts/) -![Screenshot](https://raw.githubusercontent.com/rizinorg/cutter/master/docs/source/images/screenshot.png) +![Screenshot](https://raw.githubusercontent.com/rizinorg/cutter/dev/docs/source/images/screenshot.png) ## Learn more at [cutter.re](https://cutter.re). diff --git a/docs/source/building.rst b/docs/source/building.rst index 1e1beb15..5f2d9c0a 100644 --- a/docs/source/building.rst +++ b/docs/source/building.rst @@ -6,7 +6,7 @@ Building If you just want to use the latest Release version of Cutter, please note that we provide pre-compiled binaries for Windows, Linux, and macOS on our `release page `_ and - `CI page `_ for latest development builds. + `CI page `_ for latest development builds. This page describes how to do a basic build from the command line. If you are planning to modify Cutter it is recommended to also read our :doc:`development environment setup`. diff --git a/docs/source/contributing/code/development-guidelines.rst b/docs/source/contributing/code/development-guidelines.rst index 919978ca..948d134f 100644 --- a/docs/source/contributing/code/development-guidelines.rst +++ b/docs/source/contributing/code/development-guidelines.rst @@ -257,7 +257,7 @@ In order to update one submodule individually, use the following code: .. code:: sh cd rizin - git checkout master && git pull + git checkout dev && git pull cd .. git add rizin git commit -m "Update rizin submodule" diff --git a/docs/source/contributing/code/release-procedure.rst b/docs/source/contributing/code/release-procedure.rst index bd416931..0b66147d 100644 --- a/docs/source/contributing/code/release-procedure.rst +++ b/docs/source/contributing/code/release-procedure.rst @@ -4,7 +4,7 @@ Release Procedure 1. Update translations submodule ``_ 1. The latest archive from Crowdin should already be in the repository, if not make sure to merge any automated Pull Request from Crowdin (e.g. https://github.com/rizinorg/cutter-translations/pull/9) 2. Update submodule in cutter -2. If there is a desire to keep working in the master branch, create branch for the release and do all the following work there. +2. Merge the current state of dev into stable. This can happen even earlier in order to feature-freeze the release while keeping development on dev alive. The rizin submodule on stable should point to a commit of stable in rizin and dev to a commit in dev. 3. Lock rzghidra and rzdec versions downloaded by packaging scripts. Specify a tag or commit hash. 4. Update version #. appveyor.yml @@ -19,11 +19,11 @@ Release Procedure 6. Create a GitHub release, mark it as pre-release save draft, set the tag to v1.11.0-rc1 7. Wait for packages to build 8. On all operating systems do the `Basic testing procedure`_ to ensure nothing badly broken. -9. If any major problems are found, open an issue and fix them. If a release branch is used fix them in master and cherry pick into release branch. If the amount of changes is sufficiently large repeat from step 3. increasing rc number by one. +9. If any major problems are found, open an issue and fix them in dev and cherry pick into release branch. If the amount of changes is sufficiently large repeat from step 3. increasing rc number by one. 10. Update version to 1.11.0 11. Create tag 12. Create release - * Fill the release notes in the Release description. Preparing release notes can begin earlier. Compare current master or release branch against previous release to find all the changes. Choose the most important ones. Don't duplicate the commit log. Release notes should be a summary for people who don't want to read whole commit log. Group related changes together under titles such as "New features", "Bug Fixes", "Decompiler", "Rizin" and similar. + * Fill the release notes in the Release description. Preparing release notes can begin earlier. Compare current dev branch against previous release to find all the changes. Choose the most important ones. Don't duplicate the commit log. Release notes should be a summary for people who don't want to read whole commit log. Group related changes together under titles such as "New features", "Bug Fixes", "Decompiler", "Rizin" and similar. 13. Prepare announcement tweets and messages to send in the Telegram group, reddit, and others. 14. Close milestone if there was one @@ -33,8 +33,7 @@ Bugfix Release -------------- The process for bugfix release is similar no normal release procedure described above with some differences. -* Create the branch from the last tag instead of master or reuse the branch from x.y.0 release if it was already created. -* Cherry pick required bugfixes from master into the branch. +* Cherry pick required bugfixes from dev into the stable. * Increase the third version number x.y.n into x.y.(n+1) . diff --git a/docs/source/contributing/docs/getting-started.rst b/docs/source/contributing/docs/getting-started.rst index f624edda..edc07493 100644 --- a/docs/source/contributing/docs/getting-started.rst +++ b/docs/source/contributing/docs/getting-started.rst @@ -16,7 +16,7 @@ How can you help? The following sections suggest ways you can contribute to Cutter's documentation. The list isn't complete as the possibilities are limitless. -The source for this documentation is available in the `docs directory `_ on Cutter's repository. This source can be generated according to the steps described in the :ref:`building docs page`. When the docs are updated, they are generated and pushed directly to the website at . The source for the website and blog are available on the `cutter.re's repository `_ and are served from the ``gh-pages`` branch. +The source for this documentation is available in the `docs directory `_ on Cutter's repository. This source can be generated according to the steps described in the :ref:`building docs page`. When the docs are updated, they are generated and pushed directly to the website at . The source for the website and blog are available on the `cutter.re's repository `_ and are served from the ``gh-pages`` branch. .. tip:: Document what you wished to see. If you are a user of Cutter, try to think what things you would want to see documented when you started using the project. Sometimes, the best contributions are coming from your own needs. diff --git a/src/re.rizin.cutter.appdata.xml b/src/re.rizin.cutter.appdata.xml index ccff7dd2..cfec367e 100644 --- a/src/re.rizin.cutter.appdata.xml +++ b/src/re.rizin.cutter.appdata.xml @@ -16,7 +16,7 @@ - https://raw.githubusercontent.com/rizinorg/cutter/master/docs/source/images/screenshot.png + https://raw.githubusercontent.com/rizinorg/cutter/stable/docs/source/images/screenshot.png Main UI