Skip to content

Commit a832671

Browse files
authored
Merge pull request #847 from OpenSPP/release/17.0.1.3.1
release: 17.0.1.3.1 GA
2 parents 9d8f782 + af154e2 commit a832671

402 files changed

Lines changed: 25170 additions & 13372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/claude.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/code-review-gpt.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ on:
55
pull_request:
66
branches:
77
- "17.0*"
8+
- "release/*"
89
push:
910
branches:
1011
- "17.0"
1112
- "17.0-ocabot-*"
1213
- "farmer-registry"
14+
- "release/*"
15+
tags:
16+
- "v*"
1317
env:
1418
OCA_GIT_USER_NAME: openspp
1519
OCA_GIT_USER_EMAIL: bot@openspp.org
@@ -121,6 +125,8 @@ jobs:
121125
rm -rf openg2p-program/g2p_payment_files
122126
rm -rf openg2p-program/g2p_payment_g2p_connect
123127
rm -rf openg2p-program/g2p_program_documents
128+
rm -rf openg2p-program/g2p_theme
129+
rm -rf openg2p_registry/g2p_service_provider_portal_base
124130
rm -rf mukit-modules/muk_web_enterprise_theme
125131
cp -r openg2p-registry/* ${ADDONS_DIR}/
126132
cat test-requirements.txt >> spp-test-requirements.txt
@@ -201,4 +207,5 @@ jobs:
201207
token: ${{ secrets.CODECOV_TOKEN }}
202208
- name: Update .pot files
203209
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
204-
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'openspp' }}
210+
# Only update POT files when pushing to the canonical 17.0 branch in org repo.
211+
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'openspp' && startsWith(github.ref, 'refs/heads/17.0') }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,6 @@ docs/_build/
7676
#ruff
7777
.ruff_cache
7878
.aider*
79+
80+
# Local release planning files (ignored)
81+
.release/

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ repos:
5555
- --branch=17.0
5656
- --org-name=OpenSPP
5757
- --repo-name=openspp-modules
58-
- --convert-fragments-to-markdown
5958
stages: [manual]
6059
- id: oca-gen-addons-table
6160
stages: [manual]

0 commit comments

Comments
 (0)