Skip to content

Commit bae4d53

Browse files
authored
Merge branch 'main' into nightly-mageos-fix
2 parents e3d5e7b + 2f707c8 commit bae4d53

File tree

76 files changed

+8550
-611
lines changed

Some content is hidden

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

76 files changed

+8550
-611
lines changed

README.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,11 @@ For a practical example [check this PR](https://github.com/mage-os/magento2-base
157157
then create a new branch that you'll use to create a pull request.
158158
- Update the supported versions matrix editing
159159
[src/versions/magento-open-source/individual.json](https://github.com/mage-os/github-actions/blob/main/supported-version/src/versions/magento-open-source/individual.json).
160-
Remember that, when inserting a new version like 2.4.6-p9, you´ll have to change the _end of life_
161-
date of the previous version (2.4.6-p8) to _one day earlier_ of the release date of the next version.
162-
[Check this example commit](https://github.com/mage-os/github-actions/pull/262/files#diff-0655b3d6263a5375945b0a6bbab191703f8ee83f9535a48e2871d8afec4cb2fc)
163-
and this screenshot to better understand what needs to be done:
164-
<img width=500 src="https://github.com/user-attachments/assets/2860e539-e76e-4c8f-89c6-a8c4f1331778" />
160+
Remember that, when inserting a new version like 2.4.8-p2, you´ll have to change the _end of life_
161+
date of the previous version (2.4.6-p1) to _the same day_ of the release date of the next version.
162+
[Check this example commit](https://github.com/mage-os/github-actions/pull/295/files).
165163
- Check if `magento-open-source/composite.json` needs updating
166-
(it only happens when a new "non patch" release is published, like 2.4.8).
164+
(it only happens when a new "non patch" release is published, like 2.4.9).
167165
- Now "build" the project with
168166
- In the root of the project: `npm install`
169167
- In the supported-version folder: `npm run build`
@@ -177,20 +175,17 @@ For a practical example [check this PR](https://github.com/mage-os/github-action
177175

178176
- Fork and clone https://github.com/mage-os/generate-mirror-repo-js,
179177
then create a new branch that you'll use to create a pull request.
180-
- Install latest magento version with
181-
`composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition`
182-
- "Build" the mirror with
183-
`rm -rf repositories; node src/make/mirror.js --outputDir=build`
184-
- Download all missing packages with
185-
`./bin/download-missing-packages-from-repo-magento-com.php project-community-edition/composer.lock build resource/additional-packages`
186-
- Commit and push the new files in `resource/additional-packages`.
187178
- Copy all the `composer.json` files for all releases with something like
188179
```sh
189180
cp ../mageos-magento2-base-composer-json/2.4.7-p4/magento2-base/composer.json resource/history/magento/magento2-base/2.4.7-p4.json
190181
cp ../mageos-magento2-base-composer-json/2.4.7-p4/product-community-edition/composer.json resource/history/magento/product-community-edition/2.4.7-p4.json
191182
cp ../mageos-magento2-base-composer-json/2.4.7-p4/project-community-edition/composer.json resource/history/magento/project-community-edition/2.4.7-p4.json
192183
```
193-
- Commit and push all the `composer.json` files.
184+
- "Build" the mirror with
185+
`rm -rf repositories; node src/make/mirror.js --outputDir=build`
186+
- Download all missing packages with
187+
`./bin/download-missing-packages-from-repo-magento-com.php project-community-edition/composer.lock build resource/additional-packages`
188+
- Commit and push the new files in `resource`.
194189

195190
When creating the PR on `generate-mirror-repo-js`, in order for all the checks to run,
196191
the PR will have to be merged on a development branch.
@@ -204,6 +199,9 @@ and [this second one to merge the temporary dev branch into `main`](https://gith
204199

205200
## Process of building a new Mage-OS release
206201

202+
When deciding on a new version number for a Mage-OS release,
203+
see [our version numbering RFC](https://github.com/mage-os/mageos-magento2/issues/138#event-18190625013).
204+
207205
### 0. Preliminary check
208206

209207
First we need to make sure that all `mageos-` have been updated with latest changes from upstream, we can force the updates with:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)