From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 7A0681F487 for ; Sat, 4 Apr 2020 01:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726403AbgDDBJG (ORCPT ); Fri, 3 Apr 2020 21:09:06 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:36240 "EHLO mail-pg1-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726380AbgDDBJF (ORCPT ); Fri, 3 Apr 2020 21:09:05 -0400 Received: by mail-pg1-f182.google.com with SMTP id c23so4453608pgj.3 for ; Fri, 03 Apr 2020 18:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RjJlf+NbEOVWOA3c1dQ7gl1DX4DXq6IImAbBtdg7bHM=; b=feXA3+A/M6lkFa0z8pbqIEsfAZ5q1x43OtOuQRkXT+yanQaSAqOpD1QUwaKBKVmLiW +Q2/3NodvUwKgNhOBC3v+Ue+5RyZ0T1veXLX40LqWS/T7kiOdcI2PLegUFT1ib7RiZTC ckDGDHXxpVaM4ZnnEiImZ4Z7L1iTeuWJy6YfE2qZOJVaePvk7FOHZIAS/AwnkSWkmPeI FsF7MQYFvWQAtcsGhQDJkDxtRbiI3+Mcjr4xeRzk0uphxe//56vXQgGW+1epfycCFO/i b4v8UfXJKRU+OLhXIaQ+6OMHfQ0C+knA5WSJjUopzVtdzhEOZcWSHXoRrwlLXrorfIB/ 73vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RjJlf+NbEOVWOA3c1dQ7gl1DX4DXq6IImAbBtdg7bHM=; b=ezzV8hB5Vgelhn2Qt8AZ0CvKFBmujltrqbl8M40X1Dx15CC6EZrShYB8/i43+Cy6aj KY5clBPg1/qXSNnWHRMMNqF53hf3kaDUrrWzkTHKV9m8DkuBEmkxkXjCPi7AMNVkQNYu vdY/4OBCI9adhA7t5nh/kuFcgGZoJrA6mUF4Z0ZVbvISMEK5gz/JoAveikT0Kx9nHN4L i2lVxqcNAfQht75Jg+v3YwKFnq7ZtxmlBrR1QJqlwB8WJdNrJ89ZTZWz8NO5jEINxGnJ bOIUuaM9hbWmv8LfyUr9oALhFwxy5Po5xWEiG+mtc4WUNkvCnTgJYBXq5Ea+IfoG1Hxi aAaw== X-Gm-Message-State: AGi0Pub6Z3xuIBUmNHa39exa8hg+vUkKMN1iMyRxpet832d7YQVkAagi KOaR15Bk+64PnJBNAscmULb21CFf X-Google-Smtp-Source: APiQypIgVgFCsUXytuFGMOe0a8iXvC1209Ej1UOjxcPa9SCEy+sMPY7+XHR0yTVdSy3Sbmk2a+r5MA== X-Received: by 2002:a63:ff53:: with SMTP id s19mr11034884pgk.247.1585962544018; Fri, 03 Apr 2020 18:09:04 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id o12sm6664319pjt.16.2020.04.03.18.09.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Apr 2020 18:09:03 -0700 (PDT) From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= To: git@vger.kernel.org Cc: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Subject: [PATCH v4 3/6] ci/linux32: parameterise command to switch arch Date: Sat, 4 Apr 2020 08:08:47 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a later patch, the remaining of this command will be re-used for the CI job for linux with musl libc. Allow customisation of the emulator, now. Signed-off-by: Đoàn Trần Công Danh --- ci/run-linux32-build.sh | 13 +++++++++++-- ci/run-linux32-docker.sh | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index 7f985615c2..44bb332f64 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -14,8 +14,17 @@ then exit 1 fi +case "$jobname" in +Linux32) + switch_cmd="linux32 --32bit i386" + ;; +*) + exit 1 + ;; +esac + # Update packages to the latest available versions -linux32 --32bit i386 sh -c ' +command $switch_cmd sh -c ' apt update >/dev/null && apt install -y build-essential libcurl4-openssl-dev libssl-dev \ libexpat-dev gettext python >/dev/null @@ -51,7 +60,7 @@ else fi # Build and test -linux32 --32bit i386 su -m -l $CI_USER -c " +command $switch_cmd su -m -l $CI_USER -c " set -ex export DEVELOPER='$DEVELOPER' export DEFAULT_TEST_TARGET='$DEFAULT_TEST_TARGET' diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index ebb18fa747..54186b6aa7 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -9,6 +9,7 @@ docker pull daald/ubuntu32:xenial # Use the following command to debug the docker build locally: # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial +# root@container:/# export jobname= # root@container:/# /usr/src/git/ci/run-linux32-build.sh container_cache_dir=/tmp/travis-cache @@ -21,6 +22,7 @@ docker run \ --env GIT_TEST_OPTS \ --env GIT_TEST_CLONE_2GB \ --env MAKEFLAGS \ + --env jobname \ --env cache_dir="$container_cache_dir" \ --volume "${PWD}:/usr/src/git" \ --volume "$cache_dir:$container_cache_dir" \ -- 2.26.0.334.g6536db25bb