From 7d90d7df842db5d373e242cfb291d8d855d5b77e Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 13 Mar 2026 08:36:09 +0100 Subject: [PATCH] refactor: simplify task script and update git submodule references - Remove unused dotenv load/save commands - Rename `oboobin` to `odoobin` for consistency - Remove unused PASS_ENTRY variable - Add ODOO_PARAM display in info output - Remove stale.yml GitHub workflow - Update .gitmodules.csv to reflect current submodule revisions and reduce redundancy --- task | 9 +- templates/19.0/.github/workflows/stale.yml | 69 ---------------- versions/19.0/.gitmodules.csv | 96 ++++------------------ 3 files changed, 18 insertions(+), 156 deletions(-) delete mode 100644 templates/19.0/.github/workflows/stale.yml diff --git a/task b/task index 28af579c..cc940ba9 100755 --- a/task +++ b/task @@ -18,12 +18,10 @@ help-table() { rows+=("create-dotenv|[env][type]|Create .env file of type nextcloud, odoo, upgrade.") rows+=("edit-dotenv|[env]|Open .env file in default editor.") rows+=("list-dotenv||List .env files.") - rows+=("load-dotenv||Restore content of .env from pass entry.") rows+=("load-dotenv|[env]|Load and export .env file.") rows+=("remove-dotenv|[env]|Remove environment config.") rows+=("rename-dotenv|[env][env]|Rename .env file.") rows+=("restore-dotenv-files|[path]|Extract and copy .env files from backup file.") - rows+=("save-dotenv||Store content of .env in pass entry.") rows+=("show-dotenv|[env]|Output content of the .env file.") rows+=("===GIT===| | ") rows+=("aggregate-git-folders|[path]|Run gitaggregate for the repos.yaml.") @@ -148,7 +146,7 @@ help-table() { rows+=("exec|[name][cmd]|Run command in container.") rows+=("logs|[name]|Tail container logs. Default is '\''odoo'\''.") rows+=("manifestoo|[param]|Execute manifestoo cli.") - rows+=("oboobin|[param]|Execute odoo binary.") + rows+=("odoobin|[param]|Execute odoo binary.") rows+=("odoocli|[param]|Execute odoocli cli.") rows+=("psql|[db]|Start interactive psql shell.") rows+=("restart|[name]|Restart container.") @@ -254,7 +252,6 @@ help() { # Static env vars -PASS_ENTRY="$(echo "env/${PWD##*/}" | tr '[:upper:]' '[:lower:]')" ODOO_RC="odoo.conf" TASK_DOTENV_DIR="$PWD/vault" export PYTHONPATH="$PWD/odoo" # Required so upgrade-util does not overwrite the odoo namespace @@ -307,6 +304,8 @@ fi if [ "$WITHOUT_DEMO" = "True" ]; then ODOO_PARAM="--without-demo=all" +else + ODOO_PARAM="--with-demo" fi # Import commands @@ -334,12 +333,12 @@ fi info() { set-addons-path echo "OS Release: $OS_RELEASE" - echo "Pass Entry: $PASS_ENTRY" echo "Odoo Revision: $ODOO_REVISION" echo "Odoo Version: $ODOO_VERSION" echo "Odoo Port: $ODOO_PORT" echo "Postgres Port: $POSTGRES_PORT" echo "Odoo Language: $ODOO_LANGUAGE" + echo "Odoo Param: $ODOO_PARAM" echo "Container Registry: $CONTAINER_REGISTRY" echo "Container Config: $CONTAINER_CONFIG" echo "Addons Path: $ADDONS_PATH" diff --git a/templates/19.0/.github/workflows/stale.yml b/templates/19.0/.github/workflows/stale.yml deleted file mode 100644 index fa17fcd4..00000000 --- a/templates/19.0/.github/workflows/stale.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "0 12 * * 0" - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - name: Stale PRs and issues policy - uses: actions/stale@v9 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - # General settings. - ascending: true - remove-stale-when-updated: true - # Pull Requests settings. - # 120+30 day stale policy for PRs - # * Except PRs marked as "no stale" - days-before-pr-stale: 120 - days-before-pr-close: 30 - exempt-pr-labels: "no stale" - stale-pr-label: "stale" - stale-pr-message: > - There hasn't been any activity on this pull request in the past 4 months, so - it has been marked as stale and it will be closed automatically if no - further activity occurs in the next 30 days. - - If you want this PR to never become stale, please ask a PSC member to apply - the "no stale" label. - # Issues settings. - # 180+30 day stale policy for open issues - # * Except Issues marked as "no stale" - days-before-issue-stale: 180 - days-before-issue-close: 30 - exempt-issue-labels: "no stale,needs more information" - stale-issue-label: "stale" - stale-issue-message: > - There hasn't been any activity on this issue in the past 6 months, so it has - been marked as stale and it will be closed automatically if no further - activity occurs in the next 30 days. - - If you want this issue to never become stale, please ask a PSC member to - apply the "no stale" label. - - # 15+30 day stale policy for issues pending more information - # * Issues that are pending more information - # * Except Issues marked as "no stale" - - name: Needs more information stale issues policy - uses: actions/stale@v9 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - ascending: true - only-labels: "needs more information" - exempt-issue-labels: "no stale" - days-before-stale: 15 - days-before-close: 30 - days-before-pr-stale: -1 - days-before-pr-close: -1 - remove-stale-when-updated: true - stale-issue-label: "stale" - stale-issue-message: > - This issue needs more information and there hasn't been any activity - recently, so it has been marked as stale and it will be closed automatically - if no further activity occurs in the next 30 days. - - If you think this is a mistake, please ask a PSC member to remove the "needs - more information" label. diff --git a/versions/19.0/.gitmodules.csv b/versions/19.0/.gitmodules.csv index bcfdec63..0ccd27fc 100644 --- a/versions/19.0/.gitmodules.csv +++ b/versions/19.0/.gitmodules.csv @@ -1,83 +1,15 @@ path,rev -./themes,7b23e8e51870e17e9de80bebdf44e93975ad3080 -./vault,125ef37343dfeeb83832fabe037d6053ec03942d -./oca/sale-reporting,dd0fe47e3e174ab0d4dffee1fe63ed9bc67f8a81 -./oca/bank-payment,50df7f4c088d4cddece7cecb253c1d84b421ad55 -./oca/server-ux,c4a20bbe79c25cf4a287482ae00da8b2ad4f1ada -./oca/web,f1543e10310d92d48c2c073ee1af8054315770d7 -./oca/repair,2daf574f28940e7cd536e4e3b3e5989b749c3247 -./oca/survey,d79082b42a736818fc6d8d2fcae351537b4e6566 -./oca/stock-logistics-workflow,dca22ac59478b9cde7b6ff33707551ee1ce91430 -./oca/account-reconcile,a9d8c47e4333010e31a661e812805147538c0148 -./oca/account-financial-reporting,60c21addcf2b3670de35a633be340a46b27c2e71 -./oca/iot,41b6d37e80e6d35c81f6c5e78f61ad28de36c066 -./oca/hr-holidays,d514ab87a5fe8f8c6a5253491d2b9d7618017139 -./oca/mail,1017c0efeef788b2a2e87129cc5435136b135c54 -./oca/website,dd280569e742cafeeeeb23e065c4327bb8b32139 -./oca/project,c0022e894e3761c5104962fdd09c8d1183189645 -./oca/purchase-workflow,e00648fb6254ad2af2bee76bf8409aaaa1e844ed -./oca/e-commerce,67ddaa936cf73f4e03ac46680bdecf8fbbc36049 -./oca/brand,23bc643bc329d10b33cb951fd48161a0a95ff0a2 -./oca/account-financial-tools,61d1ec735555464f3b6b243baf953c58e4bdfb0a -./oca/hr,31fa63205949c5d3cff1f1c78c0835fb05c0d426 -./oca/maintenance,6467c6bcab4bede973db198a18feaf3103e210cf -./oca/account-closing,2095617450d5984e4867c52aed5641c38dc70d9d -./oca/stock-logistics-warehouse,346bedc48c10b51ad849c4b8b751b93f261023c8 -./oca/crm,3104b94486332d172654c6fd4f494161937e3fff -./oca/contract,6f8de96e68f399dbf3268759f48cbfaad8da6d26 -./oca/server-auth,296e2e3daa5dc3d03dae4f687a51a6d77816f497 -./oca/storage,4e18dba99ce4088d681c664b8d83024174782ec9 -./oca/sale-workflow,8954aab7cbe3ed9981513d837cac8668300ed29f -./oca/timesheet,2fba8ae2b752a22eeab892853f4741a7d9240dde -./oca/product-attribute,f60c1ae38c220d7e7c0e4f967895507bae1e8b5a -./oca/bank-statement-import,c3f0e32ce467f8b5d9f1b5c319e0bcbdf6225ee4 -./oca/server-tools,5f1db60cb574a523133025c350cc754db1c51e5c -./oca/credit-control,f6a019a684dd1e128e5674972f26a904be8bd47c -./oca/helpdesk,0d5b353cc14308894e722a8957ce6020dd8e9c03 -./oca/rest-framework,84b401f381a303c1deccf88d5d8be3c22e92dfe7 -./oca/openupgrade,7f932bd1789c0b52b6dcf35564c731e354f712d8 -./oca/server-backend,92e4fe5d6743d90f0513487f433bbdc19ff6835e -./oca/l10n-switzerland,4a5d71428b031922c5419e356ae666076c078a56 -./oca/dms,6e36321817ca86dc7b00953fe640345b0ce8c787 -./oca/web-api,e5f0f77f89f17b46e7f3fb9ccad13158cda6e89e -./oca/manufacture,2572201a893dc500ff382d6fa70cee1b177c4d75 -./oca/calendar,8def516464d1c4dd4abbeb70b4f6bff12bfacb00 -./oca/account-invoicing,8b7a5b03a42c579b52a83079277baeded07b8c1c -./oca/connector,123ac286f7f32c18854e746f7162bfb37df91c74 -./oca/community-data-files,19c20705b915e6e320679defd2e8d3b8e600dcd4 -./oca/social,32074a57ae68850541328d476187a81a7826941f -./oca/business-requirement,f5288cefe13a4d16640b67c291211cf8fbb0c12e -./oca/knowledge,afcd74979cb40eed3b2d33bae360bb4a5993833a -./oca/queue,357fbd0195775b2cf0a4a0dc6b97cec6696a692a -./oca/partner-contact,e487507fe16c46496eea79a5e6adbc907ee97543 -./oca/hr-attendance,1b48ea0fd9c9e65fc45d59f4a40e61bad9465009 -./oca/edi,f946eaaba742ca204739ee1cf1d22e7b3e2bd1a8 -./oca/reporting-engine,6a487a44518af3559fe64094eb2cfd22966b5c16 -./oca/management-system,37094541181c8353fb01c207f1ee783a65f18253 -./oca/server-env,01ffc47480eca6982f99072895cbeb7ad960a767 -./addons/demand_planner,67873c818ffb12da88d2ba00f17d1b74b81f6a0a -./addons/company,873e2e632a58a7759455561976e57c68aae99425 -./addons/theme_mint_system,09890870837efde7141348a03126ff1ac620dc5f -./addons/product_attribute,f92267021b39e55f7512626b90b61e98f8c0bd8e -./addons/stock_logistics_workflow,b250302f012da0ca116855e7ba641c6eb75578ad -./addons/website,1989a93f70deb6a1e605bcf3aa01a3fa0751c201 -./addons/project,4b8f244f9e023c777811bb2359598d8d14b88758 -./addons/hr,2d20cdd1be67628ec823f3232abf2b972a1c883c -./addons/vertical_saas,a492e8f3762ef41aba4bd000500245bc1d3ac484 -./addons/contract,24dd412f21c4c421e7282754646c0576c3fdc6d8 -./addons/spreadsheet,c1c52c10cd5dad8fdbdb2fa2659b29fd24d299aa -./addons/account_invoicing,80c8607bb2629016b9dd2106ffb3cbba963f17e4 -./addons/certificate_planer,cdb97b38dd8ece555bc90add1c8e7ccb8934f484 -./addons/partner_contact,15b6e653ab9201eed1f038a6b4289bd848fec848 -./addons/purchase_workflow,7bd3d7a02f3fadf71ae58ad34f2523188d2cf3f8 -./addons/management_system,82b7ec3319d78b375e0e93b894c452fd8d12fdfd -./addons/manufacture,9cb3152d9f863d0eeb5ec4cfe328626d19994cab -./addons/connector,01717d832c156208d3c34448fb4e273e3ab70130 -./addons/server_tools,fa03465ae4758ef6e05cd83d6e72d18580e2b8e0 -./addons/social,f8becce18553a995f6013790227a0c52cd7eb12c -./addons/account_reconcile,f00d0d6618f2b7c8ea04971214ccc71a07981c53 -./addons/sale_workflow,97c38d2f732b25d62bf2545a363f91f25a037569 -./addons/account_financial_reporting,60cfd429ef448222df5e207bcaf6d4e43dba401a -./addons/kubernetes,38105593ef47b37e39e677f91fd12492dec1a1d1 -./enterprise,1d10ee238a50e7bdb552efdeafc068c5127cd49a -./odoo,d14bf6289da21065860ff959185c47b947a7418c +odoo,88df50bc96448dfaff28bd37e970ffd18bf8d554 +enterprise,2c2e358695357a730b66480fd99c27d7e922bd0b +themes,7599a4bd2862e3fcd672de78397d05bcb135df70 +addons/server_tools,9f1912a16eaf8adf799e49ceb7d19e3d1028b85d +oca/partner-contact,b6b6652548fb79c95c4f08d725a0e83356b34c99 +addons/management_system,75edcd1e4bb73c3e7c70f705150383c6e5fec158 +addons/sale_workflow,e4796bc9cd84628aac3616ba3e146a4d418a64be +addons/account_invoicing,80c8607bb2629016b9dd2106ffb3cbba963f17e4 +addons/purchase_workflow,7bd3d7a02f3fadf71ae58ad34f2523188d2cf3f8 +addons/stock_logistics_workflow,b250302f012da0ca116855e7ba641c6eb75578ad +oca/sale-workflow,87113dc142dab74f34d242904c739a14cfa05b3c +oca/server-tools,9593530f68262a411e15c46c7319926582a7451d +addons/spreadsheet,f7fc25f36cc702239f0317f5895b0d6963679a28 +addons/product_attribute,4cd5253da71c66d757ed292aa7fd18e64eef8375