diff --git a/.github/workflows/download-missing-packages.yml b/.github/workflows/download-missing-packages.yml index 296ddda1..7f3a6ccf 100644 --- a/.github/workflows/download-missing-packages.yml +++ b/.github/workflows/download-missing-packages.yml @@ -35,13 +35,16 @@ jobs: git config user.name "GitHub Actions Bot" git config user.email "github-actions[bot]@users.noreply.github.com" + - name: Configure Composer Authentication + run: | + mkdir -p ~/.composer + echo '${{ secrets.COMPOSER_AUTH }}' > ~/.composer/auth.json + - name: Run mirror script run: node src/make/mirror.js --outputDir=build - name: Run download script run: php bin/download-all-missing-packages-from-repo-magento-com.php - env: - COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} - name: Check for changes id: git-check diff --git a/resource/additional-packages/magento-module-adobe-stock-image-1.0.2.0-patch2.zip b/resource/additional-packages/magento-module-adobe-stock-image-1.0.2.0-patch2.zip new file mode 100644 index 00000000..49cc0dc4 Binary files /dev/null and b/resource/additional-packages/magento-module-adobe-stock-image-1.0.2.0-patch2.zip differ diff --git a/resource/additional-packages/magento-module-adobe-stock-image-admin-ui-1.0.3.0-patch2.zip b/resource/additional-packages/magento-module-adobe-stock-image-admin-ui-1.0.3.0-patch2.zip new file mode 100644 index 00000000..f4ed5a66 Binary files /dev/null and b/resource/additional-packages/magento-module-adobe-stock-image-admin-ui-1.0.3.0-patch2.zip differ diff --git a/resource/additional-packages/magento-module-data-exporter-103.4.13.0.zip b/resource/additional-packages/magento-module-data-exporter-103.4.13.0.zip new file mode 100644 index 00000000..794358e7 Binary files /dev/null and b/resource/additional-packages/magento-module-data-exporter-103.4.13.0.zip differ diff --git a/resource/additional-packages/magento-module-payment-services-base-2.12.2.0.zip b/resource/additional-packages/magento-module-payment-services-base-2.12.2.0.zip new file mode 100644 index 00000000..6bde5784 Binary files /dev/null and b/resource/additional-packages/magento-module-payment-services-base-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-payment-services-dashboard-2.12.2.0.zip b/resource/additional-packages/magento-module-payment-services-dashboard-2.12.2.0.zip new file mode 100644 index 00000000..a2da3691 Binary files /dev/null and b/resource/additional-packages/magento-module-payment-services-dashboard-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-payment-services-paypal-2.12.2.0.zip b/resource/additional-packages/magento-module-payment-services-paypal-2.12.2.0.zip new file mode 100644 index 00000000..dee1969c Binary files /dev/null and b/resource/additional-packages/magento-module-payment-services-paypal-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-payment-services-paypal-graph-ql-2.12.2.0.zip b/resource/additional-packages/magento-module-payment-services-paypal-graph-ql-2.12.2.0.zip new file mode 100644 index 00000000..1398f2b5 Binary files /dev/null and b/resource/additional-packages/magento-module-payment-services-paypal-graph-ql-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-payment-services-saas-export-2.12.2.0.zip b/resource/additional-packages/magento-module-payment-services-saas-export-2.12.2.0.zip new file mode 100644 index 00000000..39786508 Binary files /dev/null and b/resource/additional-packages/magento-module-payment-services-saas-export-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-query-xml-103.4.13.0.zip b/resource/additional-packages/magento-module-query-xml-103.4.13.0.zip new file mode 100644 index 00000000..6fac40f0 Binary files /dev/null and b/resource/additional-packages/magento-module-query-xml-103.4.13.0.zip differ diff --git a/resource/additional-packages/magento-module-saas-common-103.4.13.0.zip b/resource/additional-packages/magento-module-saas-common-103.4.13.0.zip new file mode 100644 index 00000000..09f6748d Binary files /dev/null and b/resource/additional-packages/magento-module-saas-common-103.4.13.0.zip differ diff --git a/resource/additional-packages/magento-module-sales-data-exporter-2.12.2.0.zip b/resource/additional-packages/magento-module-sales-data-exporter-2.12.2.0.zip new file mode 100644 index 00000000..f17a2d09 Binary files /dev/null and b/resource/additional-packages/magento-module-sales-data-exporter-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-service-proxy-2.12.2.0.zip b/resource/additional-packages/magento-module-service-proxy-2.12.2.0.zip new file mode 100644 index 00000000..f7b7d884 Binary files /dev/null and b/resource/additional-packages/magento-module-service-proxy-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-module-store-data-exporter-2.12.2.0.zip b/resource/additional-packages/magento-module-store-data-exporter-2.12.2.0.zip new file mode 100644 index 00000000..80a4205d Binary files /dev/null and b/resource/additional-packages/magento-module-store-data-exporter-2.12.2.0.zip differ diff --git a/resource/additional-packages/magento-payment-services-2.12.2.0.zip b/resource/additional-packages/magento-payment-services-2.12.2.0.zip new file mode 100644 index 00000000..42c7bd59 Binary files /dev/null and b/resource/additional-packages/magento-payment-services-2.12.2.0.zip differ diff --git a/src/build-config/mageos-release-build-config.js b/src/build-config/mageos-release-build-config.js index c70e3370..02a90f34 100644 --- a/src/build-config/mageos-release-build-config.js +++ b/src/build-config/mageos-release-build-config.js @@ -5,7 +5,7 @@ const {mergeBuildConfigs} = require('../utils'); const releaseBuildConfig = { 'magento2': { repoUrl: 'https://github.com/mage-os/mageos-magento2.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', packageIndividual: [ { @@ -16,112 +16,112 @@ const releaseBuildConfig = { }, 'security-package': { repoUrl: 'https://github.com/mage-os/mageos-security-package.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'inventory': { repoUrl: 'https://github.com/mage-os/mageos-inventory.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'inventory-composer-installer': { repoUrl: 'https://github.com/mage-os/mageos-inventory-composer-installer.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'page-builder': { repoUrl: 'https://github.com/mage-os/mageos-magento2-page-builder.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'adobe-stock-integration': { repoUrl: 'https://github.com/mage-os/mageos-adobe-stock-integration.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'magento-allure-phpunit': { repoUrl: 'https://github.com/mage-os/mageos-magento-allure-phpunit.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.1.0', }, 'magento-composer-installer': { repoUrl: 'https://github.com/mage-os/mageos-magento-composer-installer.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'composer': { repoUrl: 'https://github.com/mage-os/mageos-composer.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'composer-root-update-plugin': { repoUrl: 'https://github.com/mage-os/mageos-composer-root-update-plugin.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'composer-dependency-version-audit-plugin': { repoUrl: 'https://github.com/mage-os/mageos-composer-dependency-version-audit-plugin.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento2-sample-data': { repoUrl: 'https://github.com/mage-os/mageos-magento2-sample-data.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'magento-coding-standard': { repoUrl: 'https://github.com/mage-os/mageos-magento-coding-standard.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'magento2-functional-testing-framework': { repoUrl: 'https://github.com/mage-os/mageos-magento2-functional-testing-framework.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, 'magento-zend-db': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-db.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-loader': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-loader.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-pdf': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-pdf.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-cache': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-cache.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-exception': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-exception.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-log': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-log.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zend-memory': { repoUrl: 'https://github.com/mage-os/mageos-magento-zend-memory.git', - ref: 'release/1.x', + ref: 'mage-os', fromTag: '1.0.0', }, 'magento-zf-db': { repoUrl: 'https://github.com/mage-os/mageos-magento-zf-db.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.1.0', }, 'php-compatibility-fork': { repoUrl: 'https://github.com/mage-os/mageos-PHPCompatibilityFork.git', - ref: 'release/1.x', + ref: 'main', fromTag: '1.0.0', }, // 'theme-adminhtml-m137': { diff --git a/src/package-modules.js b/src/package-modules.js index 316bb776..d77d866b 100644 --- a/src/package-modules.js +++ b/src/package-modules.js @@ -100,6 +100,30 @@ async function getComposerJson(instruction, package, ref) { return fs.readFileSync(package.composerJsonFile, 'utf8'); } +/** + * Determine the stability level of a composer version string + * @param {string} version - The version string to check (e.g. "2.4.0-beta1", "1.0.0", "dev-master") + * @returns {string} - Returns 'dev', 'alpha', 'beta', 'RC', 'stable', or 'patch' + */ +function getVersionStability(version) { + version = version.toLowerCase(); + + if (version.startsWith('dev-') || version.includes('-dev')) { + return 'dev'; + } + if (version.includes('-alpha')) { + return 'alpha'; + } + if (version.includes('-beta')) { + return 'beta'; + } + if (version.includes('-rc')) { + return 'RC'; + } + + return 'stable'; +} + /** * @param {repositoryBuildDefinition} instruction * @param {packageDefinition} package @@ -545,18 +569,18 @@ async function determineMagentoCommunityEditionProject(url, ref, release) { * * @param {repositoryBuildDefinition} instruction * @param {buildState} release - * @param {{minimumStability:String|undefined, description:String|undefined}} options + * @param {{description:String|undefined, transform: Array}} options * @returns {Promise<{}>} */ async function createMagentoCommunityEditionProject(instruction, release, options) { const defaults = { - minimumStability: 'stable', description: 'eCommerce Platform for Growth (Community Edition)', transform: {}, }; - const {minimumStability, description, transform} = Object.assign(defaults, (options || {})) + const {description, transform} = Object.assign(defaults, (options || {})) const name = `${instruction.vendor}/project-community-edition`; const version = release.version || release.dependencyVersions[name] || release.ref; + const minimumStability = getVersionStability(version); const {packageFilepath, files} = await createComposerJsonOnlyPackage( instruction, release, diff --git a/src/release-branch-build-tools.js b/src/release-branch-build-tools.js index 3fdcc107..0b326c71 100644 --- a/src/release-branch-build-tools.js +++ b/src/release-branch-build-tools.js @@ -156,10 +156,7 @@ async function processBuildInstruction(instruction, release) { console.log('Packaging Magento Community Edition Project'); built = await createMagentoCommunityEditionProject( instruction, - release, - { - minimumStability: 'alpha' - } + release ); Object.assign(packages, built); } diff --git a/src/release-build-tools.js b/src/release-build-tools.js index 0b2c2a79..5ce09db2 100644 --- a/src/release-build-tools.js +++ b/src/release-build-tools.js @@ -273,8 +273,7 @@ async function buildMageOsProjectCommunityEditionMetapackage(instruction, releas instruction, release, { - minimumStability: 'stable', - description: 'Community built eCommerce Platform for Growth', + description: 'Community-built eCommerce Platform for Growth', transform: { [`${instruction.vendor}/project-community-edition`]: [ (composerConfig) => {