Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make master the rolling release branch #2705

Merged
merged 3 commits into from
Dec 15, 2019

Conversation

marienfressinaud
Copy link
Member

As discussed in #2668, this PR changes the main branch to keep only master. It changes mainly the documentation, plus a minor fix in the Makefile.

After merging this PR, next steps will be to:

  • change default branch back to master in GitHub settings
  • merge dev in master
  • update PRs to be against master instead of dev
  • drop dev
  • remove dev build rules on Docker hub
  • change the URL of the update_to_dev script for the update server

We are going to drop the `dev` branch. The Docker tag `dev-*` are based
on this branch and so there will be no longer be generated. We must use
images based on the `master` branch (i.e. `latest`, `alpine` and `arm`).
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
docs/en/admins/07_LinuxUpdate.md Outdated Show resolved Hide resolved
docs/en/admins/07_LinuxUpdate.md Outdated Show resolved Hide resolved
docs/en/admins/07_LinuxUpdate.md Outdated Show resolved Hide resolved
docs/en/admins/07_LinuxUpdate.md Outdated Show resolved Hide resolved
docs/en/developers/05_Release_new_version.md Outdated Show resolved Hide resolved
Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Alkarex Alkarex added this to the 1.16.0 milestone Dec 15, 2019
@Alkarex Alkarex merged commit 82851d2 into FreshRSS:dev Dec 15, 2019
@marienfressinaud marienfressinaud deleted the tec/rolling-release-on-master branch December 17, 2019 17:18
javerous pushed a commit to javerous/FreshRSS that referenced this pull request Jan 20, 2020
* Change default TAG in Makefile

We are going to drop the `dev` branch. The Docker tag `dev-*` are based
on this branch and so there will be no longer be generated. We must use
images based on the `master` branch (i.e. `latest`, `alpine` and `arm`).

* Remove references to dev branch in documentation

* Synchronize French documentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants