From 1bf46e537620de5c75102d25d4418a9ddf5ae205 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Mon, 10 Feb 2020 13:44:38 +0100
Subject: [PATCH] Fix release process choices

---
 .github/workflows/release.yml |  2 +-
 build.xml                     | 19 ++-----------------
 composer.json                 |  3 +--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f427fc0e..7e61ce1f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: PHP release
 
 on:
   release:
-    types: [published, created, edited]
+    types: [created, edited]
 
 jobs:
   run:
diff --git a/build.xml b/build.xml
index 20626ee9..9e21a291 100644
--- a/build.xml
+++ b/build.xml
@@ -18,21 +18,6 @@
         <property name="clean.done" value="true"/>
     </target>
 
-    <target name="signed-phar" depends="phar"
-            description="Create signed PHAR archive of PHPDraft and all its dependencies">
-        <exec executable="gpg" failonerror="true">
-            <arg value="--armor"/>
-            <arg value="--detach-sign"/>
-            <arg path="${project.basedir}/build/phpdraft-library-${version}.phar"/>
-        </exec>
-
-        <exec executable="gpg" failonerror="true">
-            <arg value="--armor"/>
-            <arg value="--detach-sign"/>
-            <arg path="${project.basedir}/build/phpdraft-${version}.phar"/>
-        </exec>
-    </target>
-
     <target name="phar" depends="-phar-prepare"
             description="Create PHAR archive of PHPDraft and all its dependencies">
         <phingcall target="-phar-build">
@@ -160,7 +145,7 @@
     </target>
 
     <target name="validate-composer-json" unless="validate-composer-json.done" description="Validate composer.json">
-        <exec executable="composer" failonerror="true" taskname="composer">
+        <exec executable="composer" checkreturn="true" taskname="composer">
             <arg value="validate"/>
             <arg value="--no-check-lock"/>
             <arg value="--strict"/>
@@ -173,4 +158,4 @@
     <target name="-phar-determine-version">
         <exec command="php ${project.basedir}/phpdraft --version | grep -ohE '([0-9]{1,}\.)+[0-9]{1,}'" outputproperty="version"/>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/composer.json b/composer.json
index b05af302..0b937454 100644
--- a/composer.json
+++ b/composer.json
@@ -39,8 +39,7 @@
       "vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml"
     ],
     "phar": [
-      "vendor/bin/phing phar-nightly",
-      "vendor/bin/phing signed-phar",
+      "vendor/bin/phing phar",
       "sha256sum build/out/*"
     ]
   },