From c99d69672e47e4adb2b52786e6900841d9fcb190 Mon Sep 17 00:00:00 2001 From: Laurent Laville Date: Sun, 25 Aug 2024 14:57:19 +0000 Subject: [PATCH] upgrade box config files and GH release workflow (to use the new pipeline commands) --- .github/workflows/release.yml | 11 +++-------- box.json | 10 +++++++++- box.json.dist | 15 +++++++++------ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dcb528a..40d7e19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,8 +23,6 @@ jobs: - ubuntu-22.04 php: - 8.2 - tools: - - box:4.6 # available since https://github.com/shivammathur/setup-php/releases/tag/2.27.0 steps: - # https://github.com/actions/checkout @@ -46,12 +44,9 @@ jobs: - # Build the current release with artifacts (php archive) name: Build Release Artifact run: | - bin/box-manifest manifest:build --ansi -vv -c box.json --output-file=sbom.xml - bin/box-manifest manifest:build --ansi -vv -c box.json --output-file=sbom.json - bin/box-manifest manifest:build --ansi -vv -c box.json --output-file=manifest.txt --format ansi - bin/box-manifest manifest:build --ansi -vv -c box.json --output-file=console.txt --format console - bin/box-manifest manifest:stub --ansi -vv -c box.json --output-file=stub.php --resource console.txt --resource manifest.txt --resource sbom.xml --resource sbom.json - box compile --ansi -vv -c box.json.dist + bin/box-manifest make -r console-table.txt -r plain.txt -r sbom.json build + bin/box-manifest make -r console-table.txt -r plain.txt -r sbom.json --output-stub stub.php stub + bin/box-manifest make compile -c box.json.dist -vvv --ansi - # https://github.com/softprops/action-gh-release name: Create Release from current tag diff --git a/box.json b/box.json index feac42a..1b8ad04 100644 --- a/box.json +++ b/box.json @@ -3,6 +3,14 @@ "compression": "GZ", "directories": ["bin", "src", "vendor"], "directories-bin": [ - "vendor/humbug/box/res/requirement-checker" + "vendor/humbug/box/res/requirement-checker", + "resources" + ], + "files": [ + "autoload.php", + "bootstrap.php" + ], + "files-bin": [ + "vendor/humbug/php-scoper/vendor-hotfix/.gitkeep" ] } diff --git a/box.json.dist b/box.json.dist index df15830..8db9722 100644 --- a/box.json.dist +++ b/box.json.dist @@ -6,18 +6,21 @@ "vendor/humbug/box/res/requirement-checker", "resources" ], + "files": [ + "autoload.php", + "bootstrap.php" + ], "files-bin": [ "vendor/humbug/php-scoper/vendor-hotfix/.gitkeep", - "console.txt", - "manifest.txt", + "console-table.txt", + "plain.txt", "sbom.json", - "sbom.xml" + ".box.manifests.bin" ], "stub": "stub.php", "map": [ - { "console.txt": ".box.manifests/console.txt" }, - { "manifest.txt": ".box.manifests/manifest.txt" }, - { "sbom.xml": ".box.manifests/sbom.xml" }, + { "console-table.txt": ".box.manifests/console-table.txt" }, + { "plain.txt": ".box.manifests/plain.txt" }, { "sbom.json": ".box.manifests/sbom.json" } ], "blacklist": [