From patchwork Wed Nov 23 15:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 13053781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32857C433FE for ; Wed, 23 Nov 2022 15:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238322AbiKWPDQ (ORCPT ); Wed, 23 Nov 2022 10:03:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238126AbiKWPCu (ORCPT ); Wed, 23 Nov 2022 10:02:50 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF9004E415 for ; Wed, 23 Nov 2022 07:02:38 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id y10so15697831plp.3 for ; Wed, 23 Nov 2022 07:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2cK9hYmHVVuOFM+fWUibo0z2hoi6jbpVyFvkmAjahQI=; b=ZvsF9bgUd9wv5p3Uqs1O/U6/Kyd3aVKu4T3vcixyDW7zpBxdOUzV/VslqdlWmjlusT 4PuTu+K+CMEeUhNZhX9T++o2GOYisZDq8h5WfyWDMELbqqTjAKwCMDsQt5Kg/BnaI9fy Bgu8GXgA9ysf0l1e3vjPunuHgoR4+jjB9ckPayGO4dXFLFvRj3ls98EQkSOafTz1EeZr 6sm1gGFQMpbGAeIBFZrgKIwb0W2QsBDz6d/ObXQcsgBCCXqts6kHg9cHhNk6emzDu069 iGN1JCIk1ISqwbvx04bWEWE7hz64VGmJ29RBnjL6SSizAKoHPWMsKgAaZiujmSfcrLh2 CwwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2cK9hYmHVVuOFM+fWUibo0z2hoi6jbpVyFvkmAjahQI=; b=JD2gjq/l9z84X/zTLPKB8md4yuAfDWsbE1iPAzW84XioCVyfMSD7ITt2WNI2thvGnn X+PEGPsUIau0EDIH33vEB+mk8enZHT4/nDCg/WMWWqdgQ4GzdSIqp1sPy2p5Llh9JOfW X4ZNDa9+M7oHWhYp1V1thgY8du9owhz0GZft9BFV3WQ06SNqQJRjzftrbyq3KWl/FNbY Kff0fmmEgPezkeXHejke3kzqZk1CTb93oLItIndmvyhqV5E/LLuJLgu0SarxNC+g5fU6 SxHCdRD0B6d18hW8IERxknCRgLz+3KvWgCujXB487FjvyTQCbCLYqO1P2RPFfvqxK9ku xNzQ== X-Gm-Message-State: ANoB5pl0RHMZM2gUGBQkAFV9+sE7dJt7OZw5rcwI3NURiOLTizkZALzW ZPhVbJ/UsAM9lDTD2ZCmzfnEa4qjHkY= X-Google-Smtp-Source: AA0mqf42NOs8s+RW2xwQbeX2lpv1NqrlV4brRj34oaNyfJfr75MAxa9CYR+Y4iginNCzz5Ev9gb9Ig== X-Received: by 2002:a17:902:e492:b0:17f:72c3:8922 with SMTP id i18-20020a170902e49200b0017f72c38922mr9732848ple.167.1669215757691; Wed, 23 Nov 2022 07:02:37 -0800 (PST) Received: from tigtog-proxy.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id y185-20020a6232c2000000b0056ddd2b5e9bsm12783263pfy.41.2022.11.23.07.02.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2022 07:02:37 -0800 (PST) From: Jiang Xin To: Git List , Junio C Hamano Cc: Jiang Xin , Jiang Xin Subject: [PATCH 1/2] github-actions: run gcc-8 on ubuntu-20.04 image Date: Wed, 23 Nov 2022 23:02:32 +0800 Message-Id: <20221123150233.13039-2-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20221123150233.13039-1-worldhello.net@gmail.com> References: <20221123150233.13039-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin GitHub starts to upgrade its runner image "ubuntu-latest" from version "ubuntu-20.04" to version "ubuntu-22.04". It will fail to find and install "gcc-8" package on the new runner image. Change the runner images from "ubuntu-latest" to "ubuntu-20.04" in order to run with "gcc-8" as a dependency. Instead of use the environment "$runs_on_pool" as below: case "$runs_on_pool" in ubuntu-20.04 | ubuntu-latest) ;; we can reuse the os field in the matrix, and use a new environment "$runs_on_os" as below: case "$runs_on_os" in ubuntu) ;; Signed-off-by: Jiang Xin --- .github/workflows/main.yml | 16 ++++++++++++---- ci/install-dependencies.sh | 6 +++--- ci/lib.sh | 6 +++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 592f9193a8..da0d8ab0bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -224,6 +224,7 @@ jobs: vector: - jobname: linux-clang cc: clang + os: ubuntu pool: ubuntu-latest - jobname: linux-sha256 cc: clang @@ -232,36 +233,43 @@ jobs: - jobname: linux-gcc cc: gcc cc_package: gcc-8 - pool: ubuntu-latest + os: ubuntu + pool: ubuntu-20.04 - jobname: linux-TEST-vars cc: gcc - os: ubuntu cc_package: gcc-8 - pool: ubuntu-latest + os: ubuntu + pool: ubuntu-20.04 - jobname: osx-clang cc: clang + os: macos pool: macos-latest - jobname: osx-gcc cc: gcc cc_package: gcc-9 + os: macos pool: macos-latest - jobname: linux-gcc-default cc: gcc + os: ubuntu pool: ubuntu-latest - jobname: linux-leaks cc: gcc + os: ubuntu pool: ubuntu-latest - jobname: linux-asan cc: gcc + os: ubuntu pool: ubuntu-latest - jobname: linux-ubsan cc: gcc + os: ubuntu pool: ubuntu-latest env: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} jobname: ${{matrix.vector.jobname}} - runs_on_pool: ${{matrix.vector.pool}} + runs_on_os: ${{matrix.vector.os}} runs-on: ${{matrix.vector.pool}} steps: - uses: actions/checkout@v2 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 107757a1fe..f639263a62 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -11,8 +11,8 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl" -case "$runs_on_pool" in -ubuntu-latest) +case "$runs_on_os" in +ubuntu) sudo apt-get -q update sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ $UBUNTU_COMMON_PKGS $CC_PACKAGE @@ -30,7 +30,7 @@ ubuntu-latest) cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . popd ;; -macos-latest) +macos) export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 # Uncomment this if you want to run perf tests: # brew install gnu-time diff --git a/ci/lib.sh b/ci/lib.sh index 24d20a5d64..0c0767d354 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -225,8 +225,8 @@ export DEFAULT_TEST_TARGET=prove export GIT_TEST_CLONE_2GB=true export SKIP_DASHED_BUILT_INS=YesPlease -case "$runs_on_pool" in -ubuntu-latest) +case "$runs_on_os" in +ubuntu) if test "$jobname" = "linux-gcc-default" then break @@ -253,7 +253,7 @@ ubuntu-latest) GIT_LFS_PATH="$HOME/custom/git-lfs" export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; -macos-latest) +macos) if [ "$jobname" = osx-gcc ] then MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" From patchwork Wed Nov 23 15:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 13053782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4ADFC433FE for ; Wed, 23 Nov 2022 15:03:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238191AbiKWPDb (ORCPT ); Wed, 23 Nov 2022 10:03:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238200AbiKWPDH (ORCPT ); Wed, 23 Nov 2022 10:03:07 -0500 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9906A5E3C6 for ; Wed, 23 Nov 2022 07:02:40 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id t17so15416685pjo.3 for ; Wed, 23 Nov 2022 07:02:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gMXvPv4HoZ9tzeFV9f/URkCwEVLLDpFLgZLYN1Uf13U=; b=UB4GlKnGQ8ezci++yBgLDg0QsrW2orHqXYWW3uqPAjfE7LOV1L07wl1gLF+lSKbI7V 5FMNUsRBkRFPRnhBQT0PkwNGysJYBIhdT8kRj5TmwscRHNxTlPtZ4oQnjq3kzlG4MMAu hc1vWisKIv9VH3V0WbtF9HOG7snY83P282fR2NIac/LB0CYFCk+F2Y4jlIzbGfv8dj44 08J/RXHIu3pH0rPkihyweimJAgx1dx9ngV12VODdsonHPRMgaSYICrxHE9XV7aZKaf/i go7L6/k4p/FSwZWwkC0EI+fb5edj3Hg5Ll9SXFPju7MWpxCEEjNjODTsV1a18LDhzoz4 GdDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gMXvPv4HoZ9tzeFV9f/URkCwEVLLDpFLgZLYN1Uf13U=; b=1sme+cTZfR95Yv3AmY928fdAZqTPE4/PA7mK7DiC0x55u1GnGRg9ffb68MEm2iWKa3 1WHl9EIQ4jaoE/B4ZVwKLBx+MY+5Bz1TH7XxC/H3VLDDdqZoQCPj8K+S0n+9DQKvHojP G2MUIK2Rm+bikzd4eWpJ+G+mCPw4jaShOwhyzcHx/Dv1CsEWA7QpggPfWYZ85dRXBKzE h16LunzJrM6OeTKD5FZ8FvFtosQHRNg60T0qjFcbQwZ+O8u1Uj0NPttmnUd2ck4yjZ3e kiF4U8b6MoeYy4ApQfqvRGl9LfpmbrhdmV1TCK87cc1O3yPQGDIx7IZCAmTNDHQr/DHI L8nw== X-Gm-Message-State: ANoB5pmoD1EwfDL1D22RTC9Mbnih6cVM6mJ/YYO9n72uKM7zFtwWP5iQ 9ohaXPU/hL9kRcZoNOQEcjCXIFhU9JA= X-Google-Smtp-Source: AA0mqf6btCbZzI60PEPcz5bn9CZ1vo4N3Si6Qso5PGu2v3dmrFHhxpcYskkAybZWdJ2ZK+Mm4+ZeEQ== X-Received: by 2002:a17:902:7881:b0:185:5537:f399 with SMTP id q1-20020a170902788100b001855537f399mr13643738pll.39.1669215758824; Wed, 23 Nov 2022 07:02:38 -0800 (PST) Received: from tigtog-proxy.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id y185-20020a6232c2000000b0056ddd2b5e9bsm12783263pfy.41.2022.11.23.07.02.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2022 07:02:38 -0800 (PST) From: Jiang Xin To: Git List , Junio C Hamano Cc: Jiang Xin , Jiang Xin Subject: [PATCH 2/2] ci: upgrade version of p4 Date: Wed, 23 Nov 2022 23:02:33 +0800 Message-Id: <20221123150233.13039-3-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20221123150233.13039-1-worldhello.net@gmail.com> References: <20221123150233.13039-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin There would be a segmentation fault when running p4 v16.2 on ubuntu 22.04 which is the latest version of ubuntu runner image for github actions. Upgrade p4 from version 16.2 to 19.2 will fix this issue. Also add some instructions to show errors of command "p4 -V", so we can see why the output doesn't match. Signed-off-by: Jiang Xin Reviewed-by: Johannes Schindelin Signed-off-by: Jiang Xin --- ci/install-dependencies.sh | 4 ++-- ci/lib.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index f639263a62..291e49bdde 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -83,9 +83,9 @@ esac if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1 then echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" - p4d -V | grep Rev. + p4d -V | grep Rev. || { echo >&2 "p4d: bad version"; p4d -V; exit 1; } echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V | grep Rev. + p4 -V | grep Rev. || { echo >&2 "p4: bad version"; p4 -V; exit 1; } else echo >&2 "WARNING: perforce wasn't installed, see above for clues why" fi diff --git a/ci/lib.sh b/ci/lib.sh index 0c0767d354..8474b0f249 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -246,7 +246,7 @@ ubuntu) # were recorded in the Homebrew database upon creating the OS X # image. # Keep that in mind when you encounter a broken OS X build! - export LINUX_P4_VERSION="16.2" + export LINUX_P4_VERSION="19.2" export LINUX_GIT_LFS_VERSION="1.5.2" P4_PATH="$HOME/custom/p4" From patchwork Thu Nov 24 09:05:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 13054728 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4392AC352A1 for ; Thu, 24 Nov 2022 09:06:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230160AbiKXJGT (ORCPT ); Thu, 24 Nov 2022 04:06:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbiKXJFy (ORCPT ); Thu, 24 Nov 2022 04:05:54 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F229C10FED8 for ; Thu, 24 Nov 2022 01:05:53 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id ci10so904945pjb.1 for ; Thu, 24 Nov 2022 01:05:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nAb3t3bjN4IKVbIWfZ6Ww3nZ+MGVdw3Zjx53wX9WxCM=; b=o9W/PbvXy/DJ8HwQV6f1jrZzRDzSwT5mcMctj9VNhAKWEnKQRXTx4+eAYaUjgyBwQ7 PWMygsznEGKwvZQj6oi1BN5LPDptPgETYmbAcpRCishjXp+wcMEhpaIoy90WHDVfnc7A LgGdVW5XKXe5bdmoNgwkosHI1kbENtmp9U2TCXgDwbou/jawLWeq9m8ZLe4HUQpkmXc0 2ZT9nUc6/7TILw8r4rK84yFy2YQGoIZBXUlodlt/jTeG43Qt8BDpxaNZqryGXYi1fLxk zuUSxQScXjYl+MFrXydIg2MYlJihrARnciLeXQTsgQa3tOxg24fe2SelCrRXbIdILMCv OwFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nAb3t3bjN4IKVbIWfZ6Ww3nZ+MGVdw3Zjx53wX9WxCM=; b=UUZFev+XJzXwaYmK6Z6hODVB1SQV0FPFizB+xE0bmIRu7ojn0/p/Po6RFMAWSjNMO5 /dI79p/R1k8xbDYF5FHzC0cZxxRogxaIUGuzHssmxOoZUqLZ/TfzCVS2z5S8kesyxO7+ JEKqZ0lroGJYwGyRXdkdwsE+SxkbDPmlk3iapPxwBEgcj1MS6ryJXbTlTvBa/xvnzEXB tddnHaSY4cnbDhh21R0oztNl6JQRYkcc3d6rMUTw0tqw/mHCU2XV1cttz5Q7hd6fSNMc VzWyRHSAQBebKerZnZmgC501f6GmrUO7sLTIs9iSclbyZlKJjj/mcPyUqPP6kaRXQ6i8 j2fw== X-Gm-Message-State: ANoB5pkXPaNcIcTLOb5AOpb405WsMAfzbnTQZbWxx4KjgXpCc7nUR1B6 O90cLqq21zJVNtuc3dq+9OOwSjZ/eC0= X-Google-Smtp-Source: AA0mqf7PGVXE0J3mv4dAcRm3ri9ru6lhSzsoLttAXwFD+uJYdIJYgc3Kgs3wbfAQY7vR9wDGqCLsgA== X-Received: by 2002:a17:90a:62c2:b0:20d:bc7f:4fee with SMTP id k2-20020a17090a62c200b0020dbc7f4feemr41045105pjs.168.1669280753320; Thu, 24 Nov 2022 01:05:53 -0800 (PST) Received: from tigtog-proxy.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id d8-20020a170902cec800b001893dbd8963sm689356plg.239.2022.11.24.01.05.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Nov 2022 01:05:52 -0800 (PST) From: Jiang Xin To: Git List , Junio C Hamano Cc: Jiang Xin , Jiang Xin Subject: [PATCH v2 3/3] ci: install python on ubuntu Date: Thu, 24 Nov 2022 17:05:45 +0800 Message-Id: <20221124090545.4790-4-worldhello.net@gmail.com> X-Mailer: git-send-email 2.32.0.rc3 In-Reply-To: <20221123150233.13039-1-worldhello.net@gmail.com> References: <20221123150233.13039-1-worldhello.net@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin Python is missing from the default ubuntu-22.04 runner image, which prevent git-p4 from working. To install python on ubuntu, we need to provide correct package name: * On Ubuntu 18.04 (bionic), "/usr/bin/python2" is provided by the "python" package, and "/usr/bin/python3" is provided by the "python3" package. * On Ubuntu 20.04 (focal) and above, "/usr/bin/python2" is provided by the "python2" package which has a different name from bionic, and "/usr/bin/python3" is provided by "python3". Since the "ubuntu-latest" runner image has a higher version, so its safe to use "python2" or "python3" package name. Signed-off-by: Jiang Xin --- ci/install-dependencies.sh | 2 +- ci/lib.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 291e49bdde..e28d93a154 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -15,7 +15,7 @@ case "$runs_on_os" in ubuntu) sudo apt-get -q update sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ - $UBUNTU_COMMON_PKGS $CC_PACKAGE + $UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE mkdir --parents "$P4_PATH" pushd "$P4_PATH" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d" diff --git a/ci/lib.sh b/ci/lib.sh index a618d66b81..ebe702e0ea 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -235,8 +235,10 @@ ubuntu) if [ "$jobname" = linux-gcc ] then MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" + PYTHON_PACKAGE=python3 else MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" + PYTHON_PACKAGE=python2 fi export GIT_TEST_HTTPD=true