From patchwork Mon Apr 8 06:47:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13620618 Received: from fout7-smtp.messagingengine.com (fout7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2381229CEF for ; Mon, 8 Apr 2024 06:47:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712558851; cv=none; b=XMrEa1fCBM/xveQe09pWtFU3VVSPjqan5sDwQsEnIaZn5uKA0nceUICejLVDF/MFcYdXcXGnJC6AsBygsGbch4v0936lhawq3oaCF3cTkJW8f3ywYSGGNNWzcyhAeYcQEJzx7JfdhV8ZVbLtxWsCJ5GxrcVJ4TjEYNQvCVp1bQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712558851; c=relaxed/simple; bh=U02SfRmvCfVDnmlWylHQc/xMGoa2JabEE1fDJlpHPhs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=X9hiH3f4r8VKEDgS5uGmn+Vst1U433Z7LHRiW2101az4RjWDaJl4S//ShOFbrhBl/wx0hjQ0u14H/7Txdszso7IzSd7LtiSO6iFFis0V0IZkMN7l3oQAntUydZlwMACv6U7GZYSiQqVNrQDPk0pzIq+nFNw67j8YWuCRWFuO0hU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=ZjxKsl+V; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ADyLqw2L; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="ZjxKsl+V"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ADyLqw2L" Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 4D65E1380059; Mon, 8 Apr 2024 02:47:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 08 Apr 2024 02:47:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1712558849; x=1712645249; bh=rIJosIOkGl ZlhM+8CMjeq7n1/4+LXL20PvyO3aTVYxE=; b=ZjxKsl+VhPIpfEwDB5GxhyCMHc iJBQMr975vJWLQHU+ANj2HEIHge0uGsQqVHYZq66xgX6nhZbjabke6epgKp8aoX+ ojr76DSn9Y8z1LouQ7ToqbGYiT4nHaTTMyK7vh92DdsV4aB+Gq847cizZP+dbJD/ 9BsfT8HKLAR4guWhDOFCTKMsVJ24tBCRMs/z7BaHfgqXNbPkNfoSkJRdsI71Q69/ ckDRyAp0rsL4RqDmLPAhb2LA79SXm2G/Q3r1FtJNEV63s9RnrOX2xajwyoj9dVw0 JIGyHdGv3eNCtC/WZLT87xb5Qh6NNZRDAw82Rp0oLnRdgB5IPwB09ww0rE2w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1712558849; x=1712645249; bh=rIJosIOkGlZlhM+8CMjeq7n1/4+L XL20PvyO3aTVYxE=; b=ADyLqw2L5AKnbPuxyqGb/hy520KlkETaQOb/S8dD/xLg XzNb66Tb2INakJc5uFDaXGFoRyDwAIuE0Luz48ksIsDdjhgXHqXZCK+KlYBUO6qC Xdk1SjWGhL//Zo1M2HRoJ/jlDX3NZ4rykZ5hVfv6bR52KiK9EUZWrTlUBjliyUlp KgpgAE03yxeTJqsEIYLszAAf2ZKiJAdM8zbsfLGz5uiR4/K9uk1AYgEbmJAat35T dHVU+N8EMfAupVnf1GvYH+HpsQed4lMe8+1C2vYWiy71OPOt6ZOji+Txdh+69KO4 JIsqShh3oyWYQcalBxC28IOWmo3lmbUFG6rUF98onA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudeghedguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrght rhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtth gvrhhnpeeifedvhefgkeeijeeukedtlefhieehledttdelkeeiveeiheelkedtgfevteek teenucffohhmrghinhepvhgvtghtohhrrdgttgenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 8 Apr 2024 02:47:28 -0400 (EDT) Received: by localhost (OpenSMTPD) with ESMTPSA id 19208f45 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 8 Apr 2024 06:47:21 +0000 (UTC) Date: Mon, 8 Apr 2024 08:47:25 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Josh Steadmon , Luca Milanesio , Eric Sunshine Subject: [PATCH v2 01/12] ci: rename "runs_on_pool" to "distro" Message-ID: <89723b68124fa6c91653e93a23cf15e475592fc7.1712555682.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The "runs_on_pool" environment variable is used by our CI scripts to distinguish the different kinds of operating systems. It is quite specific to GitHub Actions though and not really a descriptive name. Rename the variable to "distro" to clarify its intent. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 2 +- ci/install-dependencies.sh | 2 +- ci/lib.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3428773b09..684ef5c00d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -303,7 +303,7 @@ jobs: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} jobname: ${{matrix.vector.jobname}} - runs_on_pool: ${{matrix.vector.pool}} + distro: ${{matrix.vector.pool}} runs-on: ${{matrix.vector.pool}} steps: - uses: actions/checkout@v4 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index b4e22de3cb..7d247b5ef4 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -11,7 +11,7 @@ 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 +case "$distro" in ubuntu-*) sudo apt-get -q update sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ diff --git a/ci/lib.sh b/ci/lib.sh index 0a73fc7bd1..d882250db5 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -279,7 +279,7 @@ then cache_dir="$HOME/none" - runs_on_pool=$(echo "$CI_JOB_IMAGE" | tr : -) + distro=$(echo "$CI_JOB_IMAGE" | tr : -) JOBS=$(nproc) else echo "Could not identify CI type" >&2 @@ -318,7 +318,7 @@ export DEFAULT_TEST_TARGET=prove export GIT_TEST_CLONE_2GB=true export SKIP_DASHED_BUILT_INS=YesPlease -case "$runs_on_pool" in +case "$distro" in ubuntu-*) if test "$jobname" = "linux-gcc-default" then