Skip to content

GitLab

B
build-system
Commit 681b57ac authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated submodules

parent 8563a372
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
mender.xml
View file @ 681b57ac
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
<target name="build-mender-artifact" depends="build-go"> <target name="build-mender-artifact" depends="build-go">
<mkdir dir="${builddir}/go/src/github.com/mendersoftware"/> <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
<exec executable="tar" dir="${builddir}" failonerror="true"> <exec executable="tar" dir="${builddir}" failonerror="true">
<arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.0.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/> <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.3.0.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
</exec> </exec>
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.0.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.3.0 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
</exec> </exec>
<exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact" failonerror="true"> <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact" failonerror="true">
<arg line="build -ldflags &quot;-X main.Version=3.0.1&quot;"/> <arg line="build -ldflags &quot;-X main.Version=3.3.0&quot;"/>
</exec> </exec>
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/>
...@@ -93,13 +93,13 @@ ...@@ -93,13 +93,13 @@
<target name="rebuild-mender-artifact" depends="build-go"> <target name="rebuild-mender-artifact" depends="build-go">
<mkdir dir="${builddir}/go/src/github.com/mendersoftware"/> <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
<exec executable="tar" dir="${builddir}" failonerror="true"> <exec executable="tar" dir="${builddir}" failonerror="true">
<arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.0.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/> <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.3.0.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
</exec> </exec>
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.0.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.3.0 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
</exec> </exec>
<exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact" failonerror="true"> <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact" failonerror="true">
<arg line="build -ldflags &quot;-X main.Version=3.0.1&quot;"/> <arg line="build -ldflags &quot;-X main.Version=3.3.0&quot;"/>
</exec> </exec>
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/>
......
go @ 330b0e94
Subproject commit 30c48c431553f7cd20add9bf9f183bedcfdeb853 Subproject commit 330b0e946522942e9dd4259ca71dc85877612e50
mender-artifact @ cbb41cf1
Subproject commit eadd1e097289d43199a827a9a26738d53f704c00 Subproject commit cbb41cf145d93b937ea33707a9fe3c417bb2cf5c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment