Commit 75179413 authored by boklm's avatar boklm Committed by morgan
Browse files

Bug 41314: Update mar-tools version in projects/mar-tools/config

parent 7f90f5cd

projects/mar-tools/config

+6 −5
Original line number Diff line number Diff line
@@ -4,18 +4,19 @@ 
# to fetch mar-tools for signing machine setup, and by tools/setup-martools

# to allow running `mar` as `tools/mar`.

#

version: 12.0.4

filename: 'mar-tools-linux64.zip'

version: 14.0.4

filename: 'mar-tools.zip'

container:

  use_container: 0

gpg_keyring: torbrowser.gpg

tag_gpg_id: 1

input_files:

  - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip'

    sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584

  - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux-x86_64-[% c("version") %].zip'

    sha256sum: 414254d2471c7f0bcc25de955dbbe716c416d0b80e7688dc2dd48ac6e7fdbf0a



steps:

  fetch_martools:

    fetch_martools: |

      #!/bin/bash

      echo ok
 
      mkdir -p '[% dest_dir %]'

      cp -f mar-tools-linux-x86_64-[% c("version") %].zip '[% dest_dir %]/mar-tools.zip'

tools/setup-martools

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ function download_extract_martools { 
  if ! test -d "mar-tools-$martools_version"; then

    cd "$script_dir/.."

    ./rbm/rbm build --step fetch_martools mar-tools

    martools_zip="$(pwd)/out/mar-tools/mar-tools-linux64.zip"

    martools_zip="$(pwd)/out/mar-tools/mar-tools.zip"

    cd "$localdir"

    test -f "$martools_zip"

    unzip -jd "mar-tools-$martools_version" "$martools_zip"

tools/signing/machines-setup/setup-signing-machine

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ fi 
# install mar-tools

if ! test -d /home/signing-mar/mar-tools; then

  tmpdir=$(mktemp -d)

  unzip -d "$tmpdir" /signing/mar-tools-linux64.zip

  unzip -d "$tmpdir" /signing/mar-tools.zip

  chown -R signing-mar:signing-mar "$tmpdir/mar-tools"

  chmod go+rX "$tmpdir/mar-tools"/*

  mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools

tools/signing/machines-setup/upload-tbb-to-signing-machine

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . 
echo "Created rbm.tar"

cd ..



martools_filename=mar-tools-linux64.zip

martools_filename=mar-tools.zip

if ! test -f "./out/mar-tools/$martools_filename"; then

  ./rbm/rbm build --step fetch_martools mar-tools

  echo "Downloaded $martools_filename"