Merge pull request #341 from ergebnis/feature/branch-alias

Enhancement: Configure `branch-alias`

.github/workflows/integrate.yaml

@@ -44,6 +44,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -110,6 +113,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -128,10 +134,10 @@ jobs:
       - name: "Install dependencies with phive"
         uses: "ergebnis/.github/actions/phive/[email protected]"
         with:
-          trust-gpg-keys: "0x033E5F8D801A2F8D,0xC00543248C87FB13"
+          trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run ergebnis/composer-normalize"
-        run: ".phive/composer-normalize --ansi --dry-run"
+        run: "composer normalize --ansi --dry-run"
 
       - name: "Cache cache directory for friendsofphp/php-cs-fixer"
         uses: "actions/[email protected]"
@@ -178,6 +184,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -196,7 +205,7 @@ jobs:
       - name: "Install dependencies with phive"
         uses: "ergebnis/.github/actions/phive/[email protected]"
         with:
-          trust-gpg-keys: "0x033E5F8D801A2F8D,0xC00543248C87FB13"
+          trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run maglnet/composer-require-checker"
         run: ".phive/composer-require-checker check --ansi --config-file=$(pwd)/composer-require-checker.json --verbose"
@@ -233,6 +242,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -285,6 +297,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -344,6 +359,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -394,6 +412,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 
@@ -455,6 +476,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 

.github/workflows/renew.yaml

@@ -41,6 +41,9 @@ jobs:
       - name: "Validate composer.json and composer.lock"
         run: "composer validate --ansi --strict"
 
+      - name: "Determine composer root version"
+        uses: "ergebnis/.github/actions/composer/[email protected]"
+
       - name: "Determine composer cache directory"
         uses: "ergebnis/.github/actions/composer/[email protected]"
 

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-normalize" version="^2.42.0" installed="2.42.0" location="./.phive/composer-normalize" copy="false"/>
   <phar name="composer-require-checker" version="^3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" copy="false"/>
 </phive>

Makefile

@@ -8,7 +8,7 @@ code-coverage: vendor ## Collects code coverage from running unit tests with php
 .PHONY: coding-standards
 coding-standards: phive vendor ## Lints YAML files with yamllint, normalizes composer.json with ergebnis/composer-normalize, and fixes code style issues with friendsofphp/php-cs-fixer
 	yamllint -c .yamllint.yaml --strict .
-	.phive/composer-normalize
+	composer normalize
 	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose
 
 .PHONY: dependency-analysis

composer.json

@@ -24,6 +24,7 @@
     "ext-json": "*"
   },
   "require-dev": {
+    "ergebnis/composer-normalize": "^2.44.0",
     "ergebnis/data-provider": "^3.3.0",
     "ergebnis/license": "^2.5.0",
     "ergebnis/php-cs-fixer-config": "^6.37.0",
@@ -51,6 +52,7 @@
   "config": {
     "allow-plugins": {
       "composer/package-versions-deprecated": true,
+      "ergebnis/composer-normalize": true,
       "infection/extension-installer": true,
       "phpstan/extension-installer": true
     },
@@ -64,6 +66,9 @@
     "sort-packages": true
   },
   "extra": {
+    "branch-alias": {
+      "dev-main": "1.4-dev"
+    },
     "composer-normalize": {
       "indent-size": 2,
       "indent-style": "space"