Skip to content

Commit 75d17a2

Browse files
authored
Merge branch '2.4-develop' into 2.4-develop-upstream
2 parents 2514ef3 + 7984323 commit 75d17a2

File tree

139 files changed

+1232
-475
lines changed

Some content is hidden

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

139 files changed

+1232
-475
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Magento Code of Conduct
1+
# Mage-OS Code of Conduct
22

33
## Our Pledge
44

.github/CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Contributing to Magento 2 code
22

3-
Contributions to the Magento 2 codebase are done using the fork & pull model.
4-
This contribution model has contributors maintaining their own fork of the Magento 2 repository.
3+
Contributions to the Mage-OS Magento 2 codebase are done using the fork & pull model.
4+
This contribution model has contributors maintaining their own fork of the Mage-OS Magento 2 repository.
55
The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
66
For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
77

88
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
99

10-
The Magento 2 development team or community maintainers will review all issues and contributions submitted by the community of developers in the first in, first out order.
10+
The Mage-OS Magento 2 development team or community maintainers will review all issues and contributions submitted by the community of developers in the first in, first out order.
1111
During the review we might require clarifications from the contributor.
1212
If there is no response from the contributor within two weeks, the pull request will be closed.
1313

@@ -17,24 +17,24 @@ For more detailed information on contribution please read our [beginners guide](
1717

1818
1. Contributions must adhere to the [Magento coding standards](https://developer.adobe.com/commerce/php/coding-standards/).
1919
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
20-
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
20+
3. Commits must be accompanied by meaningful commit messages. Please see the [Mage-OS Magento Pull Request Template](https://github.com/mage-os/mageos-magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
2121
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
2222
5. PRs which include new logic or new features must be submitted along with:
2323
* Unit/integration test coverage
2424
* Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
25-
6. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
25+
6. For larger features or changes, please [open an issue](https://github.com/mage-os/mageos-magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
2626
7. All automated tests must pass.
2727

2828
## Contribution process
2929

3030
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free).
31-
This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
31+
This will allow you to collaborate with the Mage-OS Magento 2 development team, fork the Mage-OS Magento 2 project and send pull requests.
3232

33-
1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
33+
1. Search current [listed issues](https://github.com/mage-os/mageos-magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
3434
2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
3535
3. Create and test your work.
36-
4. Follow the [Forks And Pull Requests Instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) to fork the Magento 2 repository and send us a pull request.
37-
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
36+
4. Follow the [Forks And Pull Requests Instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) to fork the Mage-OS Magento 2 repository and send us a pull request.
37+
5. Once your contribution is received the Mage-OS Magento 2 development team will review the contribution and collaborate with you as needed.
3838

3939
## Code of Conduct
4040

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
Thank you for contributing to Magento.
2+
Thank you for contributing to Mage-OS.
33
To help us process this issue we recommend that you add the following information:
44
- Summary of the issue,
55
- Information on your environment,
@@ -13,7 +13,7 @@
1313
### Preconditions (*)
1414
<!---
1515
Please provide as detailed information about your environment as possible.
16-
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
16+
For example Mage-OS Magento version, tag, HEAD, PHP & MySQL version, etc..
1717
-->
1818
1.
1919
2.

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug report
2-
description: Technical issue with the Magento 2 core components
2+
description: Technical issue with the Mage-OS Magento 2 core components
33
body:
44
- type: markdown
55
attributes:
@@ -12,7 +12,7 @@ body:
1212
Describe your environment.
1313
Provide all the details that will help us to reproduce the bug.
1414
value: |
15-
- Magento version
15+
- Mage-OS Magento version
1616
- Anything else that would help a developer reproduce the bug
1717
- type: textarea
1818
attributes:
@@ -51,7 +51,7 @@ body:
5151
attributes:
5252
label: Additional information
5353
description: |
54-
Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
54+
Additional information is often requested when the bug report is processed. You can save time by providing both Mage-OS Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
5555
Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
5656
- type: textarea
5757
attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Important: This repository is intended only for Magento 2 Technical Issues.
8+
Important: This repository is intended only for Mage-OS Magento 2 Technical Issues.
99
Enter Feature Requests at https://github.com/magento/community-features.
1010
Project stakeholders monitor and manage requests.
1111
Feature requests entered using this form may be moved to the forum.
@@ -28,7 +28,7 @@ body:
2828
attributes:
2929
label: Benefits
3030
description: |
31-
How do you think this feature would improve Magento?
31+
How do you think this feature would improve Mage-OS Magento?
3232
- type: textarea
3333
attributes:
3434
label: Additional information

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
Thank you for contributing to Magento.
2+
Thank you for contributing to Mage-OS.
33
To help us process this pull request we recommend that you add the following information:
44
- Summary of the pull request,
55
- Issue(s) related to the changes made,
@@ -20,10 +20,10 @@
2020

2121
### Fixed Issues (if relevant)
2222
<!---
23-
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
23+
If relevant, please provide a list of fixed issues in the format mage-os/mageos-magento2#<issue_number>.
2424
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
2525
-->
26-
1. Fixes magento/magento2#<issue_number>
26+
1. Fixes mage-os/mageos-magento2#<issue_number>
2727

2828
### Manual testing scenarios (*)
2929
<!---
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Coding Standard With Baseline
2+
on:
3+
pull_request:
4+
branches: ["**"]
5+
permissions:
6+
contents: read
7+
jobs:
8+
coding-standard:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Run Coding Standard Baseline
12+
uses: mage-os/github-actions/coding-standard-baseline@main
13+
with:
14+
head_repo: ${{github.event.pull_request.head.repo.full_name}}
15+
head_ref: ${{github.event.pull_request.head.ref}}
16+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Integration Tests - Full Test Suite
2+
run-name: ${{ github.actor }} is running Full Integration Test Suite
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
test_directory:
7+
description: 'Test directory to run integration tests'
8+
type: string
9+
required: false
10+
11+
jobs:
12+
call-workflow:
13+
name: calling full integration test suite
14+
uses: mage-os/github-actions/.github/workflows/full-integration-tests.yaml@main
15+
secrets: inherit
16+
with:
17+
repository: ${{ github.repository }}
18+
head: ${{ github.sha }}
19+
test_directory: ${{ github.event.inputs.test_directory }}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Integration Tests (Using Nx)
2+
run-name: ${{ github.actor }} is running Integration Tests
3+
on:
4+
pull_request:
5+
branches: ["**"]
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
call-workflow:
12+
name: Calling Nx integration tests
13+
uses: mage-os/github-actions/.github/workflows/nx-integration-tests.yml@main
14+
secrets: inherit
15+
with:
16+
repository: ${{ github.repository }}
17+
pr_head: ${{ github.event.pull_request.head.sha }}
18+
pr_base: ${{ github.event.pull_request.base.ref }}
19+
20+
wait-for-result:
21+
name: Wait For Result
22+
needs: call-workflow
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: "Wait"
26+
shell: bash
27+
run: |
28+
echo "got result"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Run setup:di:compile
2+
3+
on:
4+
push:
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
setup-di-compile:
11+
name: Run bin/magento setup:di:compile
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Run setup:di:compile
15+
uses: mage-os/github-actions/setup-di-compile@main

0 commit comments

Comments
 (0)