Skip to content

Commit 30226e9

Browse files
authored
chore(release): advance master to 8.2.0-dev (openemr#12596)
## Summary Advances master from `8.1.1-dev` to `8.2.0-dev`. Frees the 8.1.x docker tag namespace for rel-810 to own (rel-810 will release 8.1.0, 8.1.1, 8.1.2, ... from this point forward) and reflects that master is now developing toward the next minor, **8.2.0**. Manual bump per the procedure in [`openemr-release-mechanism-gaps.md`](https://github.com/bradymiller/openemr/blob/master-bump-820-dev/.. -- working notes in the parent /git/ dir, not in this repo) — the conductor doesn't currently expose a `--scope=master` workflow path, so this is run by hand. ## Why now Pre-bump state: | File | Value | Note | |---|---|---| | `version.php` | `8.1.1-dev` | Conflicted semantically with rel-810 also planning to ship 8.1.1 | | `OpenApiDefinitions.php` | `'8.0.1'` | Two minor versions stale; long overdue catch-up | | `release-targets.yml` master row `docker_tags` | `8.1.1,dev` | Same conflict — master's Docker Hub tag `openemr/openemr:8.1.1` would shadow rel-810's official 8.1.1 release | Doing this before rel-810 ships 8.1.1 prevents the docker tag collision where `openemr/openemr:8.1.1` would point to master's dev image instead of rel-810's official release. ## Changes | File | Change | |---|---| | `version.php` | `$v_minor` 1 → 2, `$v_patch` 1 → 0 (keep `$v_tag = -dev`) → `8.2.0-dev` | | `src/RestControllers/OpenApi/OpenApiDefinitions.php` | `OA\Info` version `8.0.1` → `8.2.0` | | `swagger/openemr-api.yaml` | regenerated via `openemr-cmd build-api-docs` (info.version derived from `OpenApiDefinitions`) | | `sql/8_1_1-to-8_2_0_upgrade.sql` | **new** blank bridge file (long Comment Meta Language Constructs header only; body empty, fills as 8.2.0 SQL migrations land on master) | | `.github/release-targets.yml` master row | `docker_tags: 8.1.1,dev` → `8.2.0,dev`; comment refreshed for 8.2.x cycle | ## Skipped (deliberately) - **Docker upgrade machinery** (3 `docker-version` files, `fsupgrade-N.sh`, `Dockerfile` manifest). Those advance per docker version *release*, not per master-side version-state bump — master at 8.2.0-dev isn't a release. They'll advance when 8.2.0 (or whatever the next release lands) ships, with cross-branch propagation to whatever rel branch ships it. - **Branch-cut-specific work** (release-targets.yml new rel branch row, Dockerfile `ARG OPENEMR_VERSION` on a new branch). Not cutting a new branch here — just advancing master's version state. ## Test plan - [ ] CI green. The relevant guard is `docker-validate-release-targets.yml` which checks that the first `docker_tags` value matches `$v_major.$v_minor.$v_patch` from `version.php`. After this PR: both say `8.2.0`. Should pass. - [ ] Spot-check that `swagger/openemr-api.yaml`'s `info.version` reads `8.2.0` (visible in this PR's diff). - [ ] Post-merge: master's Docker Hub `openemr/openemr:8.2.0` tag starts publishing from master dev content. The previous `openemr/openemr:8.1.1` tag stops being updated from master; becomes free for rel-810 to claim when 8.1.1 ships. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
1 parent ccfc938 commit 30226e9

5 files changed

Lines changed: 121 additions & 7 deletions

File tree

.github/release-targets.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
# YAML structure.
6363

6464
- branch: master
65-
# 8.1.1 is the version master is currently developing (see version.php's
65+
# 8.2.0 is the version master is currently developing (see version.php's
6666
# $v_major.$v_minor.$v_patch). Bump this when master moves to the next
67-
# release cycle (e.g., when version.php switches to 8.1.2-dev or 8.2.0-dev).
67+
# release cycle (e.g., when version.php switches to 8.3.0-dev).
6868
# The docker_tag <-> version.php alignment guard in
6969
# docker-validate-release-targets.yml catches drift on PRs.
70-
docker_tags: 8.1.1,dev
70+
docker_tags: 8.2.0,dev
7171
openemr_version_ref: master
7272

7373
- branch: rel-810

sql/8_1_1-to-8_2_0_upgrade.sql

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
--
2+
-- Comment Meta Language Constructs:
3+
--
4+
-- #IfNotTable
5+
-- argument: table_name
6+
-- behavior: if the table_name does not exist, the block will be executed
7+
8+
-- #IfTable
9+
-- argument: table_name
10+
-- behavior: if the table_name does exist, the block will be executed
11+
12+
-- #IfColumn
13+
-- arguments: table_name colname
14+
-- behavior: if the table and column exist, the block will be executed
15+
16+
-- #IfMissingColumn
17+
-- arguments: table_name colname
18+
-- behavior: if the table exists but the column does not, the block will be executed
19+
20+
-- #IfNotColumnType
21+
-- arguments: table_name colname value
22+
-- behavior: If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
23+
24+
-- #IfNotColumnTypeDefault
25+
-- arguments: table_name colname value value2
26+
-- behavior: If the table table_name does not have a column colname with a data type equal to value and a default equal to value2, then the block will be executed
27+
28+
-- #IfNotRow
29+
-- arguments: table_name colname value
30+
-- behavior: If the table table_name does not have a row where colname = value, the block will be executed.
31+
32+
-- #IfNotRow2D
33+
-- arguments: table_name colname value colname2 value2
34+
-- behavior: If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
35+
36+
-- #IfNotRow3D
37+
-- arguments: table_name colname value colname2 value2 colname3 value3
38+
-- behavior: If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
39+
40+
-- #IfNotRow4D
41+
-- arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
42+
-- behavior: If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
43+
44+
-- #IfNotRow2Dx2
45+
-- desc: This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
46+
-- arguments: table_name colname value colname2 value2 colname3 value3
47+
-- behavior: The block will be executed if both statements below are true:
48+
-- 1) The table table_name does not have a row where colname = value AND colname2 = value2.
49+
-- 2) The table table_name does not have a row where colname = value AND colname3 = value3.
50+
51+
-- #IfRow
52+
-- arguments: table_name colname value
53+
-- behavior: If the table table_name does have a row where colname = value, the block will be executed.
54+
55+
-- #IfRow2D
56+
-- arguments: table_name colname value colname2 value2
57+
-- behavior: If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
58+
59+
-- #IfRow3D
60+
-- arguments: table_name colname value colname2 value2 colname3 value3
61+
-- behavior: If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
62+
63+
-- #IfRowIsNull
64+
-- arguments: table_name colname
65+
-- behavior: If the table table_name does have a row where colname is null, the block will be executed.
66+
67+
-- #IfIndex
68+
-- desc: This function is most often used for dropping of indexes/keys.
69+
-- arguments: table_name colname
70+
-- behavior: If the table and index exist the relevant statements are executed, otherwise not.
71+
72+
-- #IfNotIndex
73+
-- desc: This function will allow adding of indexes/keys.
74+
-- arguments: table_name colname
75+
-- behavior: If the index does not exist, it will be created
76+
77+
-- #EndIf
78+
-- all blocks are terminated with a #EndIf statement.
79+
80+
-- #IfNotListReaction
81+
-- Custom function for creating Reaction List
82+
83+
-- #IfNotListOccupation
84+
-- Custom function for creating Occupation List
85+
86+
-- #IfTextNullFixNeeded
87+
-- desc: convert all text fields without default null to have default null.
88+
-- arguments: none
89+
90+
-- #IfTableEngine
91+
-- desc: Execute SQL if the table has been created with given engine specified.
92+
-- arguments: table_name engine
93+
-- behavior: Use when engine conversion requires more than one ALTER TABLE
94+
95+
-- #IfInnoDBMigrationNeeded
96+
-- desc: find all MyISAM tables and convert them to InnoDB.
97+
-- arguments: none
98+
-- behavior: can take a long time.
99+
100+
-- #IfDocumentNamingNeeded
101+
-- desc: populate name field with document names.
102+
-- arguments: none
103+
104+
-- #IfUpdateEditOptionsNeeded
105+
-- desc: Change Layout edit options.
106+
-- arguments: mode(add or remove) layout_form_id the_edit_option comma_separated_list_of_field_ids
107+
108+
-- #IfVitalsDatesNeeded
109+
-- desc: Change date from zeroes to date of vitals form creation.
110+
-- arguments: none
111+
112+
-- #IfMBOEncounterNeeded
113+
-- desc: Add encounter to the form_misc_billing_options table
114+
-- arguments: none

src/RestControllers/OpenApi/OpenApiDefinitions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
use OpenApi\Attributes as OA;
1616

17-
#[OA\Info(title: 'OpenEMR API', version: '8.0.1')]
17+
#[OA\Info(title: 'OpenEMR API', version: '8.2.0')]
1818
#[OA\Server(url: '/apis/default/')]
1919

2020
#[OA\SecurityScheme(

swagger/openemr-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi: 3.0.0
22
info:
33
title: 'OpenEMR API'
4-
version: 8.0.1
4+
version: 8.2.0
55
servers:
66
-
77
url: /apis/default/

version.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// upgrade file is the starting point for the next upgrade.
1717

1818
$v_major = '8';
19-
$v_minor = '1';
20-
$v_patch = '1';
19+
$v_minor = '2';
20+
$v_patch = '0';
2121
$v_tag = '-dev'; // minor revision number, should be empty for production releases
2222

2323
// A real patch identifier. This is incremented when we release a patch for a

0 commit comments

Comments
 (0)