From 6fce5339ef557c3d66b0953bc0963dacef785b8d Mon Sep 17 00:00:00 2001 From: Hooverdan96 <35113775+Hooverdan96@users.noreply.github.com> Date: Thu, 3 Oct 2024 07:31:54 -0700 Subject: [PATCH] Squashed commit of the following: commit 4d60a2c683140aaa10a8e5b201157163cc9a898b Merge: 7051aded 6e08e104 Author: Philip Guyton Date: Wed Jul 12 13:06:48 2023 +0100 Merge pull request #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 #2615 commit 6e08e10492c7291ee86eac935168c0afae8b745a Author: Philip Guyton Date: Wed Jul 12 13:04:14 2023 +0100 Bump versions to a 4.6.1 base (Stable) - master branch #2615 pyproject.toml build.sh commit 7051adeda2fae690ac89ec4e9ebaadd3381475d6 Merge: 9fdeff36 e3648a8d Author: Philip Guyton Date: Tue Jul 11 17:18:10 2023 +0100 Merge pull request #2614 from phillxnet/2613_Cherry-pick_-_Update_unit_tests_re_recent_SSL_Cert_update_changes Update unit tests re recent SSL Cert update changes #2613 commit e3648a8d91909244edba22a3e651804a2ab4128e Author: Philip Guyton Date: Tue Jul 11 16:45:55 2023 +0100 Update unit tests re recent SSL Cert update changes #2611 Move test mocking from superctl to systemctl accordingly. Includes - Commented instructions on running these tests. commit 9fdeff368804c0916a9b1974afc5ed5e2f75dd8e Merge: c11c9121 6284eb75 Author: Philip Guyton Date: Mon Jul 10 15:34:26 2023 +0100 Merge pull request #2605 from phillxnet/2566_SSL_Certificate_update_doesn't_restart_nginx SSL Certificate update doesn't reload nginx #2566 commit 6284eb75014b148d7bdfa33b9a4828de49f33863 Author: Philip Guyton Date: Mon Jul 10 15:17:34 2023 +0100 SSL Certificate update doesn't reload nginx #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 c11c9121701b2af70ddbf7e767245a578321128c Merge: 65df1a62 ae3f342e Author: Philip Guyton Date: Sun Jul 9 18:28:36 2023 +0100 Merge pull request #2601 from phillxnet/#2599_Revise_Stable_Updates_activation_instructions_re_legacy_shop_removal Revise Stable Updates activation re legacy shop removal #2599 commit ae3f342e341b2a5955a15c8b872a968e68fd5636 Author: Philip Guyton Date: Sun Jul 9 18:08:49 2023 +0100 Revise Stable Updates activation instructions re legacy shop removal #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 65df1a62a04eaaae754e3e6946e75e33cc674ec0 Merge: 1d4b9d5a b4969029 Author: Philip Guyton Date: Sun Jul 9 17:46:04 2023 +0100 Merge pull request #2597 from FroggyFlox/2596_Release_process_changes_in_accompanying_repositories Add GitHub Action to trigger post-release updates across repositories #2596 commit b4969029e88068c82e8ec71713aa13b443933908 Author: FroggyFlox 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 1d4b9d5acd7236fc74d5c86f2cbfbb2c98326490 Merge: 0249f528 46f8cb4e Author: Philip Guyton Date: Tue May 30 17:05:42 2023 +0100 Merge pull request #2563 from phillxnet/master Merge testing branch into master #2529 commit 0249f5283203461d71093447611c762901f6f378 Merge: 81a0d5f5 15ae1377 Author: Philip Guyton Date: Wed Nov 2 17:18:34 2022 +0000 Merge pull request #2413 from rockstor/2412_configure_Dependabot_against_testing_branch configure Dependabot against testing branch #2412 commit 15ae1377f0861a7bcadb14906938c16a3da3f2c2 Author: Philip Guyton Date: Mon Oct 31 15:12:36 2022 +0000 configure Dependabot against testing branch #2412 Begin explicit configuration of GitHub Dependabot, adding a target-branch directive of "testing". --- .github/dependabot.yml | 12 ++++++++++++ build.sh | 0 2 files changed, 12 insertions(+) create mode 100644 .github/dependabot.yml mode change 100755 => 100644 build.sh diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..75f2ea095 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "pip" # Enable version updates for Python + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + target-branch: "testing" diff --git a/build.sh b/build.sh old mode 100755 new mode 100644