Hi Alex, Thank you for the fix. Everything worked fine this time.
Piotr sob., 5 paź 2019 o 01:51 Alex Harui <[email protected]> napisał(a): > I found some time to try the releasecandidate.xml and found the problem. > I pushed the fix to release/0.9.6. So try that and see what happens. It > seemed to do the right thing for me on my Windows computer. > > You will next likely run into several merge conflicts. I have not looked > into the conflicts, but there is a good chance that some of that is due to > the cherry-picking. I am going to start a separate thread about branch > management. > > -Alex > > On 10/4/19, 10:55 AM, "Alex Harui" <[email protected]> wrote: > > If we don't fix the release scripts, then the next RM is probably > going to run into the same problem. The time we spend now helps save time > in the future. It is wise to improve the process now in case I get run > over by a bus tomorrow. If you do it manually and make a mistake, we might > not catch it until later or cause more problems. > > IIRC, the Poms should not require changing. Maven should have done > that already. > > All the places I know of changing are in the script. > > -Alex > > On 10/4/19, 10:46 AM, "Piotr Zarzycki" <[email protected]> > wrote: > > Alex, > > Can I just do that changes manually on release branch and merge > stuff to > develop? > > I just don't won't to spend any more minute on release process > anymore. > > 1) I should change build properties > 2) I should change all poms > > Is there anymore place which I should know to change? > > Thanks, > Piotr > > On Fri, Oct 4, 2019, 7:41 PM Alex Harui <[email protected]> > wrote: > > > Piotr, > > > > Again, I am asking you to get in the mindset of a developer and > not just a > > user. You can see that the Ant script is making some updates. > You can > > verify that the release branch does not have 0.9.7 for the > release.version > > in build.properties. You can see there is 1 commit pending in > > royale-asjs. You can see that the build.properties did get > changed to have > > release.version=0.9.7. > > > > So, you will have to investigate further. What is in that > commit? Is > > this output from a fresh start of cloning the repo or could that > commit be > > from a previous run? How could Git change a file but not report > it? Maybe > > add some <echo> tags or use -verbose to get more output. But > just giving > > me minimal information and waiting for me to guess as to what to > do next is > > not very efficient, IMO. > > > > Thanks, > > -Alex > > > > On 10/4/19, 4:01 AM, "Piotr Zarzycki" <[email protected]> > wrote: > > > > Hi Alex, > > > > Git status after failing for all 3 repos [1]. > > > > Here is how build.properties look like after performing > update.versions > > target [2]. > > > > I will skip some part to move forward but update.versions is > important. > > > > [1] > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpaste.apache.org%2Fl3zs9&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=nvSDESjmBw5j%2FlBoaIPGTUiBKrkoXcAVGIyUV371eE8%3D&reserved=0 > > [2] > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpaste.apache.org%2F0zvou&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=ljQmwiJbtqsTIj3tx9%2FtKyy%2Bns5Sz7P%2BCQE3Knb%2F1fA%3D&reserved=0 > > > > Thanks, > > Piotr > > > > czw., 3 paź 2019 o 17:49 Alex Harui <[email protected] > > > > napisał(a): > > > > > What does "git status" show in the 3 repos? > > > > > > The update.versions should have at least changed the > > build.properties file > > > in the repo. > > > > > > You can try skipping over steps by listing the steps on > the command > > line. > > > You might need to list some pre-requisite steps before or > add them > > to the > > > "depends" of the step that needs it. > > > > > > ant -e -f releasecandidate.xml -Drelease.version=0.9.6 > -Drc=3 > > > update.versions merge_rc_to_develop > release.maven.staging.repo > > > > > > -Alex > > > > > > On 10/3/19, 1:49 AM, "Piotr Zarzycki" < > [email protected]> > > wrote: > > > > > > Those are the steps from the script which need to be > done still: > > > > > > 1) <antcall target="update.versions" /> > > > 2) <antcall target="merge_rc_to_develop" /> > > > 3) <antcall target="release.maven.staging.repo" /> > > > > > > Number #1 is failing. > > > > > > > > > czw., 3 paź 2019 o 10:41 Piotr Zarzycki < > > [email protected]> > > > napisał(a): > > > > > > > It looks like we already have: > > > > 1) Successfully published npm: > > > > > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40apache-royale%2Froyale-js&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=HBSzGRshuTJ2xDFdHeLsUs6INhVdTygxlhVnJG18h4Q%3D&reserved=0 > > > > 2) Successfully published which can be updated on > the website: > > > > > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.apache.org%2Fdyn%2Fcloser.lua%2Froyale%2F0.9.6%2Fbinaries%2Fapache-royale-0.9.6-bin-js.tar.gz&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=Aom6KVIcuGyMhaH6Tih1GOD7TWklkr40GSXsy4Drp7o%3D&reserved=0 > > > > > > > > Thanks, > > > > Piotr > > > > > > > > czw., 3 paź 2019 o 10:33 Piotr Zarzycki < > > [email protected]> > > > > napisał(a): > > > > > > > >> I have used npm password from private and went > trough > > publishing > > > npm and > > > >> it's failed on next step update.version with the > same error. > > Here > > > you go > > > >> full log [1]. > > > >> > > > >> What will happen if I run publish npm stuff again ? > I can > > omit that > > > part > > > >> in the next attempt. > > > >> > > > >> Om can you check whether my npm publish stuff went > ok ? > > > >> > > > >> [1] > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpaste.apache.org%2Fyl06d&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=cT350bhfIX2sL59mnbWF7sffIHN%2BhgTaCiPR%2B3AYtKQ%3D&reserved=0 > > > >> > > > >> Thanks, > > > >> Piotr > > > >> > > > >> Thanks, > > > >> Piotr > > > >> > > > >> śr., 2 paź 2019 o 18:40 Alex Harui > <[email protected]> > > > napisał(a): > > > >> > > > >>> Responses inline... > > > >>> > > > >>> On 10/2/19, 1:37 AM, "Piotr Zarzycki" < > > [email protected]> > > > >>> wrote: > > > >>> > > > >>> Just to understand something. releasecandidate > script is > > using > > > tag > > > >>> instead > > > >>> release branch to whole operation of increase > version ? > > > >>> > > > >>> No, the "get_head_of_rc_branches" target should > get you the > > head. > > > >>> > > > >>> > Hi, > > > >>> > > > > >>> > I just tried releasecandidate script. It > contains > > following > > > steps. > > > >>> > > > > >>> > <antcall target="release.tag" /> > > > >>> > <!-- this is intended to merge the > tag to > > master > > > because > > > >>> it should > > > >>> > have the right versions in it --> > > > >>> > <antcall target="merge_rc_to_master" > /> > > > >>> > <antcall > target="get_head_of_rc_branches" /> > > > >>> > <antcall target="release.npm" /> > > > >>> > <antcall target="update.versions" /> > > > >>> > <antcall > target="merge_rc_to_develop" /> > > > >>> > <antcall > target="release.maven.staging.repo" /> > > > >>> > > > > >>> > One step previous was move in svn binaries > from dev > > folder to > > > >>> release - I > > > >>> > omit that cause I did it already manually. > Launching > > > following > > > >>> steps I > > > >>> > reached release.npm - Which requires login > and > > password to > > > npm - I > > > >>> > omitted that as well. Next was > update.versions and it > > failed > > > with > > > >>> following > > > >>> > stack trace [1] > > > >>> > > > > >>> > > > >>> The login and password is available in the private@ > > archives. > > > >>> > > > >>> > > > >>> > In mentioned lines in the stacktrace I have: > > > >>> > > > > >>> > Line 1088: > > > >>> > <antcall target="update.versions" /> > > > >>> > > > > >>> > Line 1216: > > > >>> > <exec executable="${git}" dir="${compiler}" > > > failonerror="true" > > > > >>> > <arg value="commit" /> > > > >>> > <arg value="-m" /> > > > >>> > <arg value="update version to > > > ${new.release.version}" > > > >>> /> > > > >>> > </exec> > > > >>> > > > > >>> > [1] > > > >>> > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpaste.apache.org%2F15biu&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331719010&sdata=vVBlXC7nYVUkQAFYGZvqH1kq6uV5WeI%2BCG5W2nyYFEE%3D&reserved=0 > > > >>> > > > >>> You did not post the whole log, so it is possible > you missed > > a > > > step. > > > >>> There is almost no way there shouldn't be changes > and the > > head > > > should not > > > >>> be detached. > > > >>> > > > >>> -Alex > > > >>> > > > >>> > > > >> > > > >> -- > > > >> > > > >> Piotr Zarzycki > > > >> > > > >> Patreon: * > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > >> < > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > >* > > > >> > > > > > > > > > > > > -- > > > > > > > > Piotr Zarzycki > > > > > > > > Patreon: * > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > > < > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > >* > > > > > > > > > > > > > -- > > > > > > Piotr Zarzycki > > > > > > Patreon: * > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > < > > > > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > > >* > > > > > > > > > > > > > -- > > > > Piotr Zarzycki > > > > Patreon: * > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > < > > > https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C500bc3fa811d49d7fae908d748f40ca3%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637058085331729004&sdata=DtkqAnAr82aCGscm196qyKrdwTVOyNMJeqM5vRfvpiA%3D&reserved=0 > > >* > > > > > > > > > > > -- Piotr Zarzycki Patreon: *https://www.patreon.com/piotrzarzycki <https://www.patreon.com/piotrzarzycki>*
