Skip to content

GitLab

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

Updated mender-artifact to 3.5.1

parent 72a7240b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
mender.xml
View file @ fa529912
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
<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.3.0.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/> <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.5.1.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.3.0 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.5.1 ${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" failonerror="true"> <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
<arg line="mod init"/> <arg line="mod init"/>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<arg line="mod vendor"/> <arg line="mod vendor"/>
</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.3.0&quot;"/> <arg line="build -ldflags &quot;-X main.Version=3.5.1&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}"/>
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
<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.3.0.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/> <arg line="xf ${basedir}/build-system/packages/mender-artifact/mender-artifact-3.5.1.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.3.0 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.5.1 ${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" failonerror="true"> <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
<arg line="mod init"/> <arg line="mod init"/>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<arg line="mod vendor"/> <arg line="mod vendor"/>
</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.3.0&quot;"/> <arg line="build -ldflags &quot;-X main.Version=3.5.1&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 @ 9e2e55a6
Subproject commit 330b0e946522942e9dd4259ca71dc85877612e50 Subproject commit 9e2e55a6951b01e08b6d5638803ba2e9c16334d6
mender-artifact @ bde03d2b
Subproject commit cbb41cf145d93b937ea33707a9fe3c417bb2cf5c Subproject commit bde03d2beb73c02fc16b8c67d7dc1682a24b66c5
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