diff options
| author | Lakshmi Shanmugam | 2021-05-26 14:58:59 +0000 |
|---|---|---|
| committer | Lakshmi P Shanmugam | 2021-05-26 19:54:18 +0000 |
| commit | 486a1bf74d824a1f064d7e72ea6a78f36377bad5 (patch) | |
| tree | 7af44371468831d2da6f44d476084d88722579c5 | |
| parent | 1157ecbaf09777a829de57f5b641fec09fe87434 (diff) | |
| download | eclipse.platform.swt-486a1bf74d824a1f064d7e72ea6a78f36377bad5.tar.gz eclipse.platform.swt-486a1bf74d824a1f064d7e72ea6a78f36377bad5.tar.xz eclipse.platform.swt-486a1bf74d824a1f064d7e72ea6a78f36377bad5.zip | |
Bug 571787 - Fix failure in SWT-new-release job
In new_build target, chromium.properties files in binaries repo needs to
be committed first to fix failure in push_remote_from_workspace.
Change-Id: Ifda5e1a24afad05b687befcdb27ec57214679ae5
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/181054
Tested-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
Reviewed-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index b59eda2d7f..0e809ebed8 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -326,6 +326,7 @@ <!-- Commit the files --> <antcall target="commit_sources"/> + <antcall target="commit_chromium_properties"/> </target> <target name="commit_sources" depends="get_version" if="natives_changed"> @@ -339,6 +340,18 @@ <arg line="commit -m 'v${swt_version}'"/> </exec> </target> + + <target name="commit_chromium_properties" depends="get_version" if="natives_changed"> + <exec dir="${repo.bin}" executable="git" failonerror="true"> + <arg line="add 'bundles/org.eclipse.swt.browser.chromium.*/chromium-*/chromium.properties'"/> + </exec> + <exec dir="${repo.bin}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.bin}" executable="git" failonerror="true"> + <arg line="commit -m 'v${swt_version}'"/> + </exec> + </target> <target name="increment_version" depends="get_version" if="natives_changed"> <antcall target="increment_version_impl"/> @@ -999,6 +1012,9 @@ <arg line="fetch"/> </exec> <exec dir="${repo.src}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.src}" executable="git" failonerror="true"> <arg line="rebase origin/${TAG}"/> </exec> <exec dir="${repo.src}" executable="git" failonerror="true"> @@ -1008,6 +1024,9 @@ <arg line="fetch"/> </exec> <exec dir="${repo.bin}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.bin}" executable="git" failonerror="true"> <arg line="rebase origin/${TAG}"/> </exec> <exec dir="${repo.bin}" executable="git" failonerror="true"> |