Skip to content

i_1135 fix WTI package build for correct zip/gz file names #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnbrvc wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

i_1135 fix WTI package build for correct zip/gz file names #1136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions projects/WTI-API/packageWTI.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

<project name="package-WTI" default="archives" basedir=".">
<project name="package-WTI" default="archives" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless" >

<property environment="env"/>
<condition property="exists.GITHUB_RUN_NUMBER">
Expand Down Expand Up @@ -66,25 +66,50 @@
</target>

<target name="-execgit" unless="exists.GITHUB_RUN_NUMBER">
<exec executable="git" outputproperty="repo.version" failifexecutionfails="false" errorproperty="">
<!-- make sure git_hash is set, this will probably always be HEAD for this non-github target -->
<condition property="git_hash" value="${env.GIT_COMMIT}" else="HEAD" >
<isset property="env.GIT_COMMIT"/>
</condition>
<exec executable="git" outputproperty="repo.version1" failifexecutionfails="false" errorproperty="genv.error">
<arg value="rev-list"/>
<arg value="${git_hash}"/>
<arg value="--count"/>
</exec>
<!-- if above failed, set the repo.version to 0 -->
<condition property="repo.version" value="0">
<!-- genv.error wont be set if the exec failed so set it to empty -->
<condition property="genv.error" value="" >
<not>
<isset property="repo.version"/>
<isset property="genv.error" />
</not>
</condition>
<!-- Show error, for example, if there are git errors, bad hash, credentials, etc. -->
<echo unless:blank="${genv.error}" message="Git Error: ${genv.error}" />

<!-- if above exec failed, set the repo.version to 0 -->
<!-- note that if the git fails, repo.version1 will likely be set to "" -->
<condition property="repo.version" value="0" else="${repo.version1}" >
<or>
<not>
<isset property="repo.version1"/>
</not>
<equals arg1="${repo.version1}" arg2="" />
</or>
</condition>
</target>
<target name="-getenv" if="exists.GITHUB_RUN_NUMBER">
<add operand1="${lastGITLABbuild}" operand2="${env.GITHUB_RUN_NUMBER}" result="repo.version0"/>
<!--
TODO consider switching back to this at 9.8.0/9.9build
<property name="repo.version0" value="${env.GITHUB_RUN_NUMBER}"/>
-->
<condition property="version.add" value="~${env.GITHUB_REF_NAME}" else="">
<!-- PRs have pr#/merge as the GITHUB_REF_NAME, use GITHUB_HEAD_REF instead -->
<condition property="version.add0" value="pr${env.GITHUB_HEAD_REF}" else="${env.GITHUB_REF_NAME}">
<and>
<isset property="env.GITHUB_HEAD_REF" />
<matches string="${env.GITHUB_REF_NAME}" pattern="^.+/merge$$" />
</and>
</condition>

<condition property="version.add" value="~${version.add0}" else="">
<not>
<equals arg1="${env.GITHUB_REF_NAME}" arg2="master"/>
</not>
Expand Down