From 3133e1880fc3ff5a4045fa512b236133c7388224 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Sun, 19 Nov 2023 10:50:16 +0100 Subject: [PATCH 1/4] Update changelog for 6.1.2 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e32bc7ded..c29cb77df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ This document describes changes between each past release. ## 6.1.2 (unreleased) - -- Nothing changed yet. +- Fix password generation command line crash (#1242) +- Update to flask and werkzeug 2.3 (#1244) ## 6.1.1 (2023-10-04) From 15f01de070ac7d833c94ca30424cf36f8bbadeeb Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Sun, 19 Nov 2023 10:53:30 +0100 Subject: [PATCH 2/4] Preparing release 6.1.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c29cb77df..2c7a75b74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This document describes changes between each past release. -## 6.1.2 (unreleased) +## 6.1.2 (2023-11-19) - Fix password generation command line crash (#1242) - Update to flask and werkzeug 2.3 (#1244) From 54cd4236b86ca7525c0470f5a152e73d17f3db43 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Sun, 19 Nov 2023 10:55:57 +0100 Subject: [PATCH 3/4] Back to development: 6.2.0 --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c7a75b74..8e0e3f18e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ This document describes changes between each past release. +## 6.2.0 (unreleased) + + +- Nothing changed yet. + + ## 6.1.2 (2023-11-19) - Fix password generation command line crash (#1242) diff --git a/pyproject.toml b/pyproject.toml index 5212054b1..13af5cde4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "ihatemoney" -version = "6.1.2.dev0" +version = "6.2.0.dev0" description = "A simple shared budget manager web application." readme = "README.md" license = {file = "LICENSE"} From ae388135711957ee3a527a1fab0c7f58001c369b Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Sun, 19 Nov 2023 11:07:54 +0100 Subject: [PATCH 4/4] CI: run tests and docker build on stable branches --- .github/workflows/dockerhub.yml | 4 ++-- .github/workflows/test-docs.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 002ee5951..c8943b9d1 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -3,9 +3,9 @@ name: CI to Docker Hub on: push: tags: ['*'] - branches: [ master ] + branches: [ 'master', 'stable-*' ] pull_request: - branches: [ master ] + branches: [ 'master', 'stable-*' ] jobs: diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index dfdc83760..aaf778558 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -2,9 +2,9 @@ name: Test & Docs on: push: - branches: [ master ] + branches: [ 'master', 'stable-*' ] pull_request: - branches: [ master ] + branches: [ 'master', 'stable-*' ] jobs: build: