IMO, any change that can't be supported by a technical explanation probably shouldn't be committed. Can you explain why this change is necessary?
-Alex On 9/19/19, 1:03 AM, "Piotr Zarzycki" <[email protected]> wrote: I just went trough whole the process and didn't have any kind of problems. I'm pushing RC2. If you think I should revert that I can. I don't have anymore console log with it. śr., 18 wrz 2019 o 16:18 Alex Harui <[email protected]> napisał(a): > Changing releaseversion to release.version should not be necessary and > might break something else. Can you reproduce the failure? What is the > console log? How did it not pick up the releaseversion from > build.properties? > > -Alex > > On 9/17/19, 10:53 PM, "[email protected]" <[email protected]> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > piotrz pushed a commit to branch release/0.9.6 > in repository > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931764780&sdata=ETBx881FDXp%2FwR9qLHW95kJl5uNPTBGDOqsjPvoIBlI%3D&reserved=0 > > > The following commit(s) were added to refs/heads/release/0.9.6 by this > push: > new 84c2e85 Fix releasessteps script > 84c2e85 is described below > > commit 84c2e855c5a316ad21ff3a8ac6ac0cde826eecf0 > Author: Piotr Zarzycki <[email protected]> > AuthorDate: Wed Sep 18 07:47:03 2019 +0200 > > Fix releasessteps script > > - Add RoyaleUnit to swcs list and sign target > - Fix property release.version > --- > releasesteps.xml | 43 +++++++++++++++++++++++-------------------- > 1 file changed, 23 insertions(+), 20 deletions(-) > > diff --git a/releasesteps.xml b/releasesteps.xml > index 01d0061..5c3edf1 100644 > --- a/releasesteps.xml > +++ b/releasesteps.xml > @@ -219,7 +219,7 @@ > <delete file="${artifactfolder}/swcs.txt" /> > <!-- this is a comma-delimited, no spaces, no-line-breaks > list used to decide which swcs > to skip in the rat-check of the binaries and which swcs to > examine before approval --> > - <property name="swcs-list" > value="Basic,Binding,Charts,Collections,Core,CreateJS,DragDrop,Effects,Express,Flat,FontAwesome,Formatters,GoogleMaps,Graphics,HTML,HTML5,Icons,JQuery,Jewel,Crux,Language,MXRoyale,MaterialDesignLite,Mobile,Network,Reflection,RoyaleSite,SparkRoyale,Storage,TLF,Text,XML,BasicTheme,JewelTheme"/> > + <property name="swcs-list" > value="Basic,Binding,Charts,Collections,Core,CreateJS,DragDrop,Effects,Express,Flat,FontAwesome,Formatters,GoogleMaps,Graphics,HTML,HTML5,Icons,JQuery,Jewel,Crux,Language,MXRoyale,MaterialDesignLite,Mobile,Network,Reflection,RoyaleUnit,RoyaleSite,SparkRoyale,Storage,TLF,Text,XML,BasicTheme,JewelTheme"/> > <echo file="${artifactfolder}/swcs.txt" > message="${swcs-list}"/> > </target> > > @@ -501,6 +501,9 @@ > <antcall target="sign-swc-artifacts" > > <param name="swcname" value="RoyaleSite" /> > </antcall> > + <antcall target="sign-swc-artifacts" > > + <param name="swcname" value="RoyaleUnit" /> > + </antcall> > <antcall target="sign-swc-artifacts" > > <param name="swcname" value="SparkRoyale" /> > </antcall> > @@ -880,7 +883,7 @@ > > <target name="build-ant-source" > depends="check-air-home,check-playerglobal-home,check-runtime-env" > > <mkdir dir="${artifactfolder}/sources" /> > - <unzip > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-src.zip" > dest="${artifactfolder}/sources" > > + <unzip > src="${artifactfolder}/artifacts/apache-royale-${release.version}-src.zip" > dest="${artifactfolder}/sources" > > </unzip> > > <ant dir="${artifactfolder}/sources/royale-asjs" target="all" > /> > @@ -891,21 +894,21 @@ > <exec executable="git" dir="${artifactfolder}/sources" > failonerror="true" > > <arg value="clone" /> > <arg value="--branch" /> > - <arg > value="org.apache.royale.compiler-${releaseversion}-rc${rc}" /> > + <arg > value="org.apache.royale.compiler-${release.version}-rc${rc}" /> > <arg value=" > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931764780&sdata=0WaXWxReg5ZwWf1MXEnGNpICKAmamq59g885pp3I0cQ%3D&reserved=0"; > /> > <arg value="royale-compiler" /> > </exec> > <exec executable="git" dir="${artifactfolder}/sources" > failonerror="true" > > <arg value="clone" /> > <arg value="--branch" /> > - <arg > value="org.apache.royale.typedefs-${releaseversion}-rc${rc}" /> > + <arg > value="org.apache.royale.typedefs-${release.version}-rc${rc}" /> > <arg value=" > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Froyale-typedefs.git&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931764780&sdata=qurNjh0lV7TpvkKjQAnBh48l2YPDxCcxTBP%2BNQe1pH8%3D&reserved=0"; > /> > <arg value="royale-typedefs" /> > </exec> > <exec executable="git" dir="${artifactfolder}/sources" > failonerror="true" > > <arg value="clone" /> > <arg value="--branch" /> > - <arg > value="org.apache.royale.framework-${releaseversion}-rc${rc}" /> > + <arg > value="org.apache.royale.framework-${release.version}-rc${rc}" /> > <arg value=" > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931774775&sdata=2lflk%2BpR5JaskhugM5eptFRYu04ry%2FjE52cJ4ljl5YU%3D&reserved=0"; > /> > <arg value="royale-asjs" /> > </exec> > @@ -916,7 +919,7 @@ > <target name="validate-ant-source" description="do some tweaks so > the clone is the same as maven source file set" > > <!-- unpack ant src which was generated from maven source > package --> > <mkdir dir="${artifactfolder}/artifacts/source" /> > - <unzip > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-src.zip" > dest="${artifactfolder}/artifacts/source" /> > + <unzip > src="${artifactfolder}/artifacts/apache-royale-${release.version}-src.zip" > dest="${artifactfolder}/artifacts/source" /> > <property name="artifactfolder" value="${artifactfolder}" /> > <!-- get the build date from flex-sdk-description and use it > --> > <xmlproperty > file="${artifactfolder}/artifacts/source/royale-asjs/flex-sdk-description.xml" > prefix="desc" /> > @@ -948,14 +951,14 @@ > </target> > > <target name="compare-src-zips" > > - <echo>releaseversion: ${releaseversion}</echo> > + <echo>release.version: ${release.version}</echo> > <echo>copy src-zip file to a separate folder</echo> > <mkdir dir="${artifactfolder}/artifacts/srczip" /> > - <copy > file="${artifactfolder}/artifacts/apache-royale-${releaseversion}-src.zip" > - > tofile="${artifactfolder}/artifacts/srczip/apache-royale-${releaseversion}-src.zip" > /> > + <copy > file="${artifactfolder}/artifacts/apache-royale-${release.version}-src.zip" > + > tofile="${artifactfolder}/artifacts/srczip/apache-royale-${release.version}-src.zip" > /> > <mkdir dir="${artifactfolder}/sources/srczip" /> > - <copy > file="${artifactfolder}/sources/royale-asjs/out/apache-royale-${releaseversion}-src.zip" > - > tofile="${artifactfolder}/sources/srczip/apache-royale-${releaseversion}-src.zip" > /> > + <copy > file="${artifactfolder}/sources/royale-asjs/out/apache-royale-${release.version}-src.zip" > + > tofile="${artifactfolder}/sources/srczip/apache-royale-${release.version}-src.zip" > /> > <echo>running reproducible build plugin on > ${artifactfolder}/artifacts/srczip</echo> > <exec executable="${mvn}" dir="${artifactfolder}" > failonerror="true" > > <arg > value="io.github.zlika:reproducible-build-maven-plugin:0.10:strip-jar" /> > @@ -967,10 +970,10 @@ > <arg > value="-Dreproducible.outputDirectory=${artifactfolder}/sources/srczip" /> > </exec> > <condition property="filesmatch" value="true"> > - <filesmatch > file1="${artifactfolder}/artifacts/srczip/apache-royale-${releaseversion}-src.zip" > - > file2="${artifactfolder}/sources/srczip/apache-royale-${releaseversion}-src.zip" > /> > + <filesmatch > file1="${artifactfolder}/artifacts/srczip/apache-royale-${release.version}-src.zip" > + > file2="${artifactfolder}/sources/srczip/apache-royale-${release.version}-src.zip" > /> > </condition> > - <fail message="apache-royale-${releaseversion}-src.zip does > not match" unless="filesmatch" /> > + <fail message="apache-royale-${release.version}-src.zip does > not match" unless="filesmatch" /> > </target> > > <target name="validate-ant-bits"> > @@ -980,16 +983,16 @@ > <mkdir dir="${artifactfolder}/artifacts/zip/js" /> > <mkdir dir="${artifactfolder}/artifacts/zip/swf" /> > <mkdir dir="${artifactfolder}/artifacts/zip/src" /> > - <unzip > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-src.zip" > dest="${artifactfolder}/artifacts/zip/src" /> > - <untar > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-src.tar.gz" > dest="${artifactfolder}/artifacts/tar/src" compression="gzip"> > + <unzip > src="${artifactfolder}/artifacts/apache-royale-${release.version}-src.zip" > dest="${artifactfolder}/artifacts/zip/src" /> > + <untar > src="${artifactfolder}/artifacts/apache-royale-${release.version}-src.tar.gz" > dest="${artifactfolder}/artifacts/tar/src" compression="gzip"> > <cutdirsmapper dirs="1" /> > </untar> > - <unzip > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-bin-js.zip" > dest="${artifactfolder}/artifacts/zip/js" /> > - <untar > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-bin-js.tar.gz" > dest="${artifactfolder}/artifacts/tar/js" compression="gzip"> > + <unzip > src="${artifactfolder}/artifacts/apache-royale-${release.version}-bin-js.zip" > dest="${artifactfolder}/artifacts/zip/js" /> > + <untar > src="${artifactfolder}/artifacts/apache-royale-${release.version}-bin-js.tar.gz" > dest="${artifactfolder}/artifacts/tar/js" compression="gzip"> > <cutdirsmapper dirs="1" /> > </untar> > - <unzip > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-bin-js-swf.zip" > dest="${artifactfolder}/artifacts/zip/swf" /> > - <untar > src="${artifactfolder}/artifacts/apache-royale-${releaseversion}-bin-js-swf.tar.gz" > dest="${artifactfolder}/artifacts/tar/swf" compression="gzip"> > + <unzip > src="${artifactfolder}/artifacts/apache-royale-${release.version}-bin-js-swf.zip" > dest="${artifactfolder}/artifacts/zip/swf" /> > + <untar > src="${artifactfolder}/artifacts/apache-royale-${release.version}-bin-js-swf.tar.gz" > dest="${artifactfolder}/artifacts/tar/swf" compression="gzip"> > <cutdirsmapper dirs="1" /> > </untar> > <antcall target="validate-ant-jars" /> > > > > -- Piotr Zarzycki Patreon: *https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931774775&sdata=h%2Bj%2BmAfNdnDwvj0ECMxyFKlc%2BY4jc38MhaXirqESy1U%3D&reserved=0 <https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Cd1486c9d132a491e274108d73cd7cff9%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637044769931774775&sdata=h%2Bj%2BmAfNdnDwvj0ECMxyFKlc%2BY4jc38MhaXirqESy1U%3D&reserved=0>*
