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

Merge testing branch into master #2529

Closed
phillxnet opened this issue Apr 15, 2023 · 0 comments · Fixed by #2563
Closed

Merge testing branch into master #2529

phillxnet opened this issue Apr 15, 2023 · 0 comments · Fixed by #2563
Milestone
First Stable Poet...

Comments

@phillxnet
Copy link
Member

phillxnet commented Apr 15, 2023 •
edited
Loading

We currently have a way-old master branch as it represents the state-of-code for our Stable release rpm (v4.1.0-0). However in the interim we have had much development in our testing channel (intended for development and our testing channel rpm releases. This testing/developer channel has also migrated our build system to Poetry (all-be-it a specific version). This was required as our master channel build system became unworkable due to bit-rot. This, and our limited resources, has inevitably lead to a stagnation of the master branch - and no consequent stable rpm releases past v4.1.0-0.

But as of this issue's creation data we are on Stable Release Candidate 5 (v4.5.8-0) and have begun including the RC rpms in our pre-build installers. It is thus proposed that we soon merge our testing channel into our master (Stable) channel so that we might prepare and test our back-end production/build/publishing mechanisms ready for our future parrallel development program: i.e. where we do best-effort to maintain our master (Stable rpm) code for priority bug fixes, while we embark on our next major development phase of moving to Python 3 in our testing channel, which would inevitably make the testing channel unusable in production for an indeterminate amount of time.

Leaving this merge until the last minute (as we establish our next Stable rpm) would be removing a buffer period prior to our announcing our:
First Stable Poetry build: https://github.com/rockstor/rockstor-core/milestone/19
And in the context of the master branch currently being un-build-able we have no real down side bar having to maintain two branches for a few releases: something we are intending to do in the near future anyway to facilitate our major Python update work to come.
@phillxnet phillxnet added this to the First Stable Poetry build milestone Apr 15, 2023
@phillxnet phillxnet mentioned this issue Apr 16, 2023
Open
This was referenced May 30, 2023
Closed
Merged
phillxnet added a commit that referenced this issue May 30, 2023
@phillxnet
Merge pull request #2563 from phillxnet/master
1d4b9d5 
Merge testing branch into master #2529
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
First Stable Poetry build
Development

Successfully merging a pull request may close this issue.

Merge testing branch into master #2529 phillxnet/rockstor-core
1 participant
@phillxnet