Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: repair mirror builds #94

Merged
merged 49 commits into from
Aug 15, 2023
Merged

Conversation

Vinai
Copy link
Contributor

@Vinai Vinai commented Aug 15, 2023

This fixes a regression introduced while implementing the release build process.

Vinai and others added 30 commits April 26, 2023 10:47
Merge in Vinai's work so far on release build process
…nore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.
…nore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.
…ckages-config, re-order Composer command arguments, rename Git create branch function
* fix: satis build missing template with generator version
@Vinai Vinai requested a review from a team as a code owner August 15, 2023 12:28
@mage-os-ci mage-os-ci merged commit 51c8779 into mage-os:develop Aug 15, 2023
mage-os-ci added a commit that referenced this pull request Sep 18, 2023
* feat: Add coding standard and mftf (#82)

* Remove obsolete comment

* feat: activate missing coding-standard and mftf repo

* feat: Add magento/composer package to mirror build config (#83)

* Remove obsolete comment

* feat: activate missing coding-standard and mftf repo

* feat: enable magento/composer packages to be built

* feat: add coding standard and mftf to upstream-nightly builds (#84)

* feat: add coding-standard and mftf to upstream-nightly builds

* Add coding standard and mftf to mageos nightly (#85)

* feat: add coding-standard and mftf mageos-nightly builds

* chore: update develop branch to include latest changes merged directly into main (#93)

* Remove obsolete comment

* feat: Add generator version number to Satis HTML

* fix: satis build via GitHub workflow (#88)

* fix: satis build missing template with generator version

* feat: add releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2 (#89)

feat: add upstream releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2

* fix: exclude .gitignore from 245p4 246p2 base package (#90)

* chore: exclude .gititnore from 2.4.5-p4 and 2.4.6-p2 base package

* fix: exclude .gitignore from 244p5 base package

* chore: exclude .gititnore from 2.4.4-p5 base package

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>

* feat: implement mage-os release build process (#92)

* [feat] implement building upstream version map

* feat: start outlining build process in code (WIP)

* feat(wip): install sample data for creating the upstream version map

* feat: finalize sample data in upstream version map (wip)

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat (wip): Further improvements to last commit - remove .git from packages-config, re-order Composer command arguments, rename Git create branch function

* Add .editorconfig

* chore: Correct code formatting

* feat: start implementing product-community-edition meta-package (wip)

* Implement code to build mage-os/product-community-edition package

* Set version of dependencies for mage-os packages to release version

* Generate packages from prepared release branch (WIP)

* Memoize working copy state to speed up build process

* Extract build config merging to allow adding key/values to individual instructions

* Generate meta packages from directories using the mage-os vendor name

* Prep and build project metapackage (WIP)

* Add config for missing packages (disabled until repos exist)

* Remove obsolete comment

* chore: add new upstream repos to configs

* fix: use correct source ref when creating a branch

* - feat: Add generator version number to Satis HTML

* fix: satis build via GitHub workflow (#88)

* fix: satis build missing template with generator version

* Make release vendor name a command argument

* chore: update readme with latest changes

* feat: add new command options to generate a release

* docs: add overview how to create custom releases

* chore: tweak wip-branch name

* feat: add releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2 (#89)

feat: add upstream releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2

* fix: exclude .gitignore from 245p4 246p2 base package (#90)

* chore: exclude .gititnore from 2.4.5-p4 and 2.4.6-p2 base package

* fix: exclude .gitignore from 244p5 base package

* chore: exclude .gititnore from 2.4.4-p5 base package

* feat: add github workflow to build and deploy a mage-os release

* chore: improve labels to be more clear

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Mage-OS <100189073+mage-os-ci@users.noreply.github.com>

* fix: repair mirror builds (#94)

* [feat] implement building upstream version map

* feat: start outlining build process in code (WIP)

* feat(wip): install sample data for creating the upstream version map

* feat: finalize sample data in upstream version map (wip)

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat (wip): Further improvements to last commit - remove .git from packages-config, re-order Composer command arguments, rename Git create branch function

* Add .editorconfig

* chore: Correct code formatting

* feat: start implementing product-community-edition meta-package (wip)

* Implement code to build mage-os/product-community-edition package

* Set version of dependencies for mage-os packages to release version

* Generate packages from prepared release branch (WIP)

* Memoize working copy state to speed up build process

* Extract build config merging to allow adding key/values to individual instructions

* Generate meta packages from directories using the mage-os vendor name

* Prep and build project metapackage (WIP)

* Add config for missing packages (disabled until repos exist)

* Remove obsolete comment

* chore: add new upstream repos to configs

* fix: use correct source ref when creating a branch

* feat: Add generator version number to Satis HTML

* fix: satis build via GitHub workflow (#88)

* fix: satis build missing template with generator version

* Make release vendor name a command argument

* chore: update readme with latest changes

* feat: add new command options to generate a release

* docs: add overview how to create custom releases

* chore: tweak wip-branch name

* feat: add releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2 (#89)

* feat: add upstream releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2

* fix: exclude .gitignore from 245p4 246p2 base package (#90)

* chore: exclude .gititnore from 2.4.5-p4 and 2.4.6-p2 base package

* fix: exclude .gitignore from 244p5 base package

* chore: exclude .gititnore from 2.4.4-p5 base package

* feat: add github workflow to build and deploy a mage-os release

* chore: improve labels to be more clear

* Fix mirror builds after changes to composer.json template path for releases

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>

* fix: add missing inputs to step arguments (#96)

* [feat] implement building upstream version map

* feat: start outlining build process in code (WIP)

* feat(wip): install sample data for creating the upstream version map

* feat: finalize sample data in upstream version map (wip)

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat (wip): Further improvements to last commit - remove .git from packages-config, re-order Composer command arguments, rename Git create branch function

* Add .editorconfig

* chore: Correct code formatting

* feat: start implementing product-community-edition meta-package (wip)

* Implement code to build mage-os/product-community-edition package

* Set version of dependencies for mage-os packages to release version

* Generate packages from prepared release branch (WIP)

* Memoize working copy state to speed up build process

* Extract build config merging to allow adding key/values to individual instructions

* Generate meta packages from directories using the mage-os vendor name

* Prep and build project metapackage (WIP)

* Add config for missing packages (disabled until repos exist)

* Remove obsolete comment

* chore: add new upstream repos to configs

* fix: use correct source ref when creating a branch

* - feat: Add generator version number to Satis HTML

* fix: satis build via GitHub workflow (#88)

* fix: satis build missing template with generator version

* Make release vendor name a command argument

* chore: update readme with latest changes

* feat: add new command options to generate a release

* docs: add overview how to create custom releases

* chore: tweak wip-branch name

* feat: add releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2 (#89)

feat: add upstream releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2

* fix: exclude .gitignore from 245p4 246p2 base package (#90)

* chore: exclude .gititnore from 2.4.5-p4 and 2.4.6-p2 base package

* fix: exclude .gitignore from 244p5 base package

* chore: exclude .gititnore from 2.4.4-p5 base package

* feat: add github workflow to build and deploy a mage-os release

* chore: improve labels to be more clear

* Fix mirror builds after changes to composer.json template path for releases

* fix: add missing inputs to step arguments

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>

* fix: typo in compute-release-service-versions (#97)

* [feat] implement building upstream version map

* feat: start outlining build process in code (WIP)

* feat(wip): install sample data for creating the upstream version map

* feat: finalize sample data in upstream version map (wip)

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat(wip): Preparation of child package composer.json files, add --ignore-platform-reqs to Composer commands, changes to packages-config, start work to checkout work-in-progress branches.

* feat (wip): Further improvements to last commit - remove .git from packages-config, re-order Composer command arguments, rename Git create branch function

* Add .editorconfig

* chore: Correct code formatting

* feat: start implementing product-community-edition meta-package (wip)

* Implement code to build mage-os/product-community-edition package

* Set version of dependencies for mage-os packages to release version

* Generate packages from prepared release branch (WIP)

* Memoize working copy state to speed up build process

* Extract build config merging to allow adding key/values to individual instructions

* Generate meta packages from directories using the mage-os vendor name

* Prep and build project metapackage (WIP)

* Add config for missing packages (disabled until repos exist)

* Remove obsolete comment

* chore: add new upstream repos to configs

* fix: use correct source ref when creating a branch

* feat: Add generator version number to Satis HTML

* fix: satis build via GitHub workflow (#88)

* fix: satis build missing template with generator version

* Make release vendor name a command argument

* chore: update readme with latest changes

* feat: add new command options to generate a release

* docs: add overview how to create custom releases

* chore: tweak wip-branch name

* feat: add releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2 (#89)

* feat: add upstream releases 2.4.4-p5, 2.4.5-p4 and 2.4.6-p2

* fix: exclude .gitignore from 245p4 246p2 base package (#90)

* chore: exclude .gititnore from 2.4.5-p4 and 2.4.6-p2 base package

* fix: exclude .gitignore from 244p5 base package

* chore: exclude .gititnore from 2.4.4-p5 base package

* feat: add github workflow to build and deploy a mage-os release

* chore: improve labels to be more clear

* Fix mirror builds after changes to composer.json template path for releases

* fix: add missing inputs to step arguments

* fix: typo in compute-release-service-versions

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>

* Feature #75 integrity check improvement (#101)

* #75 add integrity check

* #75 - fixes from stupid Squirrel

* #75 - add suggest, replace, conflict sections in checklist and optimized code

* #75 create new workflow

* #75 create new workflow

* #75 fix coderview points from Vinai

* #75 merge old and new integrity checks with Vinai

* #75 remove unneded dependencies

* #75 add npm install (#103)

* #75 remove chalk for integrity checker… (#104)

* #75 remove chalk for integrity checker - minimise dependencies

* #75 add ignoring of .git folder

* feat: fix version discrepancies between public github repos and published packages from adobe (#105)

* fix: adjust more version discrepancies between public github repos and published packages from adobe (#106)

* fix: tags with -dev suffix generate incompatible nightly version (#107)

* fix: tags with -dev suffix generate incompatible nightly version keeping stability at alpha (#108)

* fix: tags with -dev suffix generate incompatible nightly version keeping stability at alpha (#109)

* Fix docker image build for current PHP ext installer version and git (#112)

* fix: install npm in image to install generator deps (#113)

* Fix docker image build for current PHP ext installer version and git

* fix: install npm in image to pull in generator deps

* chore: resolve conflicts with main branch (#114)

* feat: fix mirror packages composer.json to match upstream (#110)

Also repair nightly builds

* feat: fix mirror package checksums (#111)

This MR fixes the mirror package composer.json version constraints as well as upstream and mage-os nightly generation.

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>

* fix: resolve merge conflict with main (#116)

* feat: fix mirror packages composer.json to match upstream (#110)

Also repair nightly builds

* feat: fix mirror package checksums (#111)

This MR fixes the mirror package composer.json version constraints as well as upstream and mage-os nightly generation.

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>

---------

Co-authored-by: callum-zero1 <callum.breeze@zero1.co.uk>
Co-authored-by: Mage-OS <100189073+mage-os-ci@users.noreply.github.com>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants