Skip to content

Commit

Permalink
Use hub long option names and use named release uploads. See [Issue #…
Browse files Browse the repository at this point in the history
  • Loading branch information
jaswsinc committed Dec 21, 2016
1 parent 9edeb39 commit 355d769
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Lite build with pro Composer dependencies. Fixed in this release. See [Issue #146](https://github.com/websharks/phings/issues/146).
- Exclude `composer.json` and `composer.lock` from final distros. See [Issue #141](https://github.com/websharks/phings/issues/141).
- Strip unnecessary files from final distros. See [Issue #150](https://github.com/websharks/phings/issues/150).
- Use `hub` long option names and use named release uploads. See [Issue #112](https://github.com/websharks/phings/issues/112).

## v160908.63229

Expand Down
8 changes: 4 additions & 4 deletions src/psr4/targets/releases/lite-release-finish.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<isTrue value="${_releases_release_type_is_rc}" />
</and>
<then>
<property name="_releases_lite_release_git_create_pre" value=" -p" />
<property name="_releases_lite_release_git_create_pre" value=" --prerelease" />
</then>
<else>
<property name="_releases_lite_release_git_create_pre" value="" />
Expand All @@ -64,7 +64,7 @@
<isTrue value="${draft}" />
</and>
<then>
<property name="_releases_lite_release_git_create_draft" value=" -d" />
<property name="_releases_lite_release_git_create_draft" value=" --draft" />
</then>
<else>
<property name="_releases_lite_release_git_create_draft" value="" />
Expand All @@ -77,10 +77,10 @@
<available resource="${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.phar" type="file" />
</and>
<then>
<property name="_releases_lite_release_git_create_assets" value="-a '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.zip' -a '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.tar.gz' -a '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.phar'" />
<property name="_releases_lite_release_git_create_assets" value="--asset '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.zip#${project_lite_slug}-v${project_version}.zip' --asset '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.tar.gz#${project_lite_slug}-v${project_version}.tar.gz' --asset '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.phar#${project_lite_slug}-v${project_version}.phar'" />
</then>
<else>
<property name="_releases_lite_release_git_create_assets" value="-a '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.zip' -a '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.tar.gz'" />
<property name="_releases_lite_release_git_create_assets" value="--asset '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.zip#${project_lite_slug}-v${project_version}.zip' --asset '${project.basedir}/.~build/${project_lite_slug}/.~build/${project_lite_slug}.tar.gz#${project_lite_slug}-v${project_version}.tar.gz'" />
</else>
</if>

Expand Down
10 changes: 5 additions & 5 deletions src/psr4/targets/releases/release-finish.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<isTrue value="${_releases_release_type_is_rc}" />
</and>
<then>
<property name="_releases_release_git_create_pre" value=" -p" />
<property name="_releases_release_git_create_pre" value=" --prerelease" />
</then>
<else>
<property name="_releases_release_git_create_pre" value="" />
Expand All @@ -170,7 +170,7 @@
</and>
</or>
<then>
<property name="_releases_release_git_create_draft" value=" -d" />
<property name="_releases_release_git_create_draft" value=" --draft" />
</then>
<else>
<property name="_releases_release_git_create_draft" value="" />
Expand All @@ -184,10 +184,10 @@
<available resource="${project.basedir}/.~build/${project_slug}.phar" type="file" />
</and>
<then>
<property name="_releases_release_git_create_assets" value="-a '${project.basedir}/.~build/${project_slug}.zip' -a '${project.basedir}/.~build/${project_slug}.tar.gz' -a '${project.basedir}/.~build/${project_slug}.phar'" />
<property name="_releases_release_git_create_assets" value="--asset '${project.basedir}/.~build/${project_slug}.zip#${project_slug}-v${project_version}.zip' --asset '${project.basedir}/.~build/${project_slug}.tar.gz#${project_slug}-v${project_version}.tar.gz' --asset '${project.basedir}/.~build/${project_slug}.phar#${project_slug}-v${project_version}.phar'" />
</then>
<else>
<property name="_releases_release_git_create_assets" value="-a '${project.basedir}/.~build/${project_slug}.zip' -a '${project.basedir}/.~build/${project_slug}.tar.gz'" />
<property name="_releases_release_git_create_assets" value="--asset '${project.basedir}/.~build/${project_slug}.zip#${project_slug}-v${project_version}.zip' --asset '${project.basedir}/.~build/${project_slug}.tar.gz#${project_slug}-v${project_version}.tar.gz'" />
</else>
</if>

Expand Down Expand Up @@ -273,7 +273,7 @@
</else>
</if>

<property name="_releases_release_git_create_command" value="hub release create -f '${_tmp_sub_dir}/${project_slug}-commit-msg'${_releases_release_git_create_pre}${_releases_release_git_create_draft} ${_releases_release_git_create_assets} ${project_version}" />
<property name="_releases_release_git_create_command" value="hub release create --file '${_tmp_sub_dir}/${project_slug}-commit-msg'${_releases_release_git_create_pre}${_releases_release_git_create_draft} ${_releases_release_git_create_assets} ${project_version}" />
<exec command="${_releases_release_git_create_command}" dir="${project.basedir}" checkReturn="true" outputProperty="_releases_release_git_create_output" />

<property name="_releases_release_git_create_release_url" value="${_releases_release_git_create_output}">
Expand Down

0 comments on commit 355d769

Please sign in to comment.