Merge pull request #112 from jolicode/phar-a-on

Refactore how we build the phar

Author: lyrixx

.github/actions/phar/action.yaml

@@ -7,21 +7,12 @@ runs:
         - name: Setup PHP
           uses: shivammathur/setup-php@v2
           with:
-              php-version: "8.1"
-
-        - name: Install dependencies (lib)
-          run: composer install --prefer-dist --no-progress --no-dev --optimize-autoloader --classmap-authoritative
-          shell: bash
-
-        - name: Install dependencies (PHAR builder)
-          run: composer install --prefer-dist --no-progress --optimize-autoloader --classmap-authoritative
-          shell: bash
-          working-directory: tools/phar
+              php-version: "8.3"
+              tools: castor
 
         - name: Compile PHAR
-          run: vendor/bin/box compile
+          run: castor phar:compile
           shell: bash
-          working-directory: tools/phar
 
         - name: Ensure PHAR is OK
           run: build/jolitypo.phar --version

.github/workflows/build-phar.yml

@@ -3,6 +3,8 @@ name: Build the PHAR
 on:
     push:
         branches: ["main"]
+    pull_request:
+        branches: ["main"]
 
 permissions:
     contents: read

castor.php

@@ -8,3 +8,5 @@
  */
 
 Castor\import(__DIR__ . '/website/castor.php');
+Castor\mount(__DIR__ . '/tools/cli/');
+Castor\mount(__DIR__ . '/tools/phar/');

tools/cli/.gitignore

@@ -0,0 +1,2 @@
+/.castor.stub.php
+/vendor/

tools/phar/bin/jolitypo renamed to tools/cli/bin/jolitypo

@@ -11,7 +11,6 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Finder\Finder;
 
 require __DIR__ . '/../vendor/autoload.php';
-require __DIR__ . '/../../../vendor/autoload.php';
 
 $help = <<<EOTXT
 

tools/cli/castor.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of JoliTypo - a project by JoliCode.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ */
+
+namespace cli;
+
+use Castor\Attribute\AsTask;
+
+use function Castor\io;
+use function Castor\run;
+
+#[AsTask(description: 'install dependencies')]
+function install(): void
+{
+    io()->title('Install phar dependencies');
+
+    run(['composer', 'install']);
+}
+
+#[AsTask(description: 'update dependencies')]
+function update(): void
+{
+    io()->title('Update phar dependencies');
+    run(['composer', 'update']);
+}

tools/cli/composer.json

@@ -0,0 +1,35 @@
+{
+    "name": "jolicode/jolitypo-phar",
+    "description": "Tooling for building JoliTypo PHAR",
+    "type": "project",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Grégoire Pineau",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Mathieu Santostefano",
+            "email": "[email protected]"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../.."
+        }
+    ],
+    "require": {
+        "jolicode/jolitypo": "*@dev",
+        "symfony/console": "^7.2",
+        "symfony/finder": "^7.2"
+    },
+    "config": {
+        "bump-after-update": true,
+        "optimize-autoloader": true,
+        "platform": {
+            "php": "8.3.20"
+        },
+        "sort-packages": true
+    }
+}