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.

Sign up for GitHub

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

Jump to bottom

Bump versions to a 4.6.1 base (Stable) - master branch #2615

Closed
phillxnet opened this issue Jul 11, 2023 · 3 comments · Fixed by #2617
Closed

Bump versions to a 4.6.1 base (Stable) - master branch #2615

phillxnet opened this issue Jul 11, 2023 · 3 comments · Fixed by #2617
Milestone
4.6.0-0 Maintenan...

Comments

@phillxnet
Copy link
Member

phillxnet commented Jul 11, 2023 •
edited
Loading

We have now had 4.6.0-0 (RC7) in testing channel for around 6 weeks:
https://forum.rockstor.com/t/v4-5-testing-channel-changelog/8546/13
with it's promotion to the stable channel as our
"First Stable Poetry build": https://github.com/rockstor/rockstor-core/milestone/19
delayed by around 3 weeks due to the following:
https://forum.rockstor.com/t/appman-rockstor-com-maintenance-open-collective-integration/8867
which in-turn necessitated some stable activation instructions changes.

Regardless, given 4.6.0-0 (RC7) was promoted to master branch (Stable), we have already begun work on maintenance of this stable branch via the following GitHub milestone:

"4.6.0-0 Maintenance issues": https://github.com/rockstor/rockstor-core/milestone/21

Where our Stable activation instructions update and a subsequent Web-UI SSL cert config and associated test have already been addressed.

As such it is proposed that we now update our versioning ready for the previously planned Stable channel release (with a short stay in testing channel updates rpm repository as per our usual policy).
@phillxnet
Copy link
Member Author

This issue is to be closed by version changes (in master branch pyproject.toml) indicating our new stable phase.

@phillxnet
Copy link
Member Author

phillxnet commented Jul 12, 2023 •
edited
Loading

Currently master branch has the following test status following a build.sh procedure:
https://rockstor.com/docs/contribute/contribute.html#code-build
https://rockstor.com/docs/contribute/contribute.html#code-test

buildvm:/opt/rockstor # poetry env info

Virtualenv
Python:         2.7.18
Implementation: CPython
Path:           /opt/rockstor/.venv
Valid:          True

cd /opt/rockstor/src/rockstor
buildvm:~ # export DJANGO_SETTINGS_MODULE=settings
buildvm:/opt/rockstor/src/rockstor # poetry run django-admin test -v 2
...
Ran 253 tests in 28.179s

OK

phillxnet added a commit to phillxnet/rockstor-core that referenced this issue Jul 12, 2023
@phillxnet
Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615
6e08e10 
pyproject.toml build.sh
phillxnet added a commit that referenced this issue Jul 12, 2023
@phillxnet
Merge pull request #2617 from phillxnet/2615_Bump_versions_to_a_4.6.1…
4d60a2c 
…_base_(Stable)_-_master_branch

Bump versions to a 4.6.1 base (Stable) - master branch #2615
@phillxnet phillxnet mentioned this issue Jul 12, 2023
Merged
@phillxnet
Copy link
Member Author

Closing as
Fixed by #2617

@phillxnet phillxnet added this to the 4.6.0-0 Maintenance issues milestone Jul 12, 2023
Hooverdan96 added a commit to Hooverdan96/rockstor-core that referenced this issue Oct 3, 2024
@Hooverdan96
Squashed commit of the following:
6fce533 
commit 4d60a2c
Merge: 7051ade 6e08e10
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Wed Jul 12 13:06:48 2023 +0100

    Merge pull request rockstor#2617 from phillxnet/2615_Bump_versions_to_a_4.6.1_base_(Stable)_-_master_branch

    Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615

commit 6e08e10
Author: Philip Guyton <philip@yewtreeapps.com>
Date:   Wed Jul 12 13:04:14 2023 +0100

    Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615

    pyproject.toml build.sh

commit 7051ade
Merge: 9fdeff3 e3648a8
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Tue Jul 11 17:18:10 2023 +0100

    Merge pull request rockstor#2614 from phillxnet/2613_Cherry-pick_-_Update_unit_tests_re_recent_SSL_Cert_update_changes

    Update unit tests re recent SSL Cert update changes rockstor#2613

commit e3648a8
Author: Philip Guyton <philip@yewtreeapps.com>
Date:   Tue Jul 11 16:45:55 2023 +0100

    Update unit tests re recent SSL Cert update changes rockstor#2611

    Move test mocking from superctl to systemctl accordingly.
    Includes
    - Commented instructions on running these tests.

commit 9fdeff3
Merge: c11c912 6284eb7
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Mon Jul 10 15:34:26 2023 +0100

    Merge pull request rockstor#2605 from phillxnet/2566_SSL_Certificate_update_doesn't_restart_nginx

    SSL Certificate update doesn't reload nginx rockstor#2566

commit 6284eb7
Author: Philip Guyton <philip@yewtreeapps.com>
Date:   Mon Jul 10 15:17:34 2023 +0100

    SSL Certificate update doesn't reload nginx rockstor#2566

    Use systemctl wrapper to reload nginx post SSL cert
    reconfig. From Rockstor v4.5.4-0 onwards nginx is no
    longer managed by supervisord.
    # Includes
    - Nginx reload not restart to avoid Web-UI service
    interruption and enable confirmation dialog display.

commit c11c912
Merge: 65df1a6 ae3f342
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Sun Jul 9 18:28:36 2023 +0100

    Merge pull request rockstor#2601 from phillxnet/#2599_Revise_Stable_Updates_activation_instructions_re_legacy_shop_removal

    Revise Stable Updates activation re legacy shop removal rockstor#2599

commit ae3f342
Author: Philip Guyton <philip@yewtreeapps.com>
Date:   Sun Jul 9 18:08:49 2023 +0100

    Revise Stable Updates activation instructions re legacy shop removal rockstor#2599

    Modify our "Activate Stable updates" dialog instructions
    in accordance with our removal of the now legacy/redundant
    shop that has now been replaced by Appman's initial integration
    with our newly established Open Collective.

commit 65df1a6
Merge: 1d4b9d5 b496902
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Sun Jul 9 17:46:04 2023 +0100

    Merge pull request rockstor#2597 from FroggyFlox/2596_Release_process_changes_in_accompanying_repositories

    Add GitHub Action to trigger post-release updates across repositories rockstor#2596

commit b496902
Author: FroggyFlox <flox2b@gmail.com>
Date:   Mon Jul 3 11:24:18 2023 -0400

    Add GitHub Action to trigger post-release updates across repositories

    After each release, we are currently manually performing the required
    changes and udpates across our repositories.
    This commit adds a GitHub Action workflow to trigger these changes
    automatically.

commit 1d4b9d5
Merge: 0249f52 46f8cb4
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Tue May 30 17:05:42 2023 +0100

    Merge pull request rockstor#2563 from phillxnet/master

    Merge testing branch into master rockstor#2529

commit 0249f52
Merge: 81a0d5f 15ae137
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Wed Nov 2 17:18:34 2022 +0000

    Merge pull request rockstor#2413 from rockstor/2412_configure_Dependabot_against_testing_branch

    configure Dependabot against testing branch rockstor#2412

commit 15ae137
Author: Philip Guyton <phillxnet@users.noreply.github.com>
Date:   Mon Oct 31 15:12:36 2022 +0000

    configure Dependabot against testing branch rockstor#2412

    Begin explicit configuration of GitHub Dependabot,
    adding a target-branch directive of "testing".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.6.0-0 Maintenance issues
Development

Successfully merging a pull request may close this issue.

Bump versions to a 4.6.1 base (Stable) - master branch #2615 phillxnet/rockstor-core
1 participant
@phillxnet