From patchwork Thu Oct 31 23:49:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 13858503 Received: from complex.crustytoothpaste.net (complex.crustytoothpaste.net [172.105.7.114]) (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 9119319C564 for ; Thu, 31 Oct 2024 23:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=172.105.7.114 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418943; cv=none; b=I19jxaBMyuR5yV+cXj6Z8Uu4dcHys5mOKZEXRoKjW2J8/N7tcZpzde8h1cKmxYrx8pMNkqwnUBrg5BLUs+J6pIOedD6IAwSp7/I9mCaQ4n8R8wtKC3NLGQCK3nZU7h2Ue3GdV7Kl00e3E+fqkbXviRY99yaTMxAUzLO1j1+NIC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418943; c=relaxed/simple; bh=eB/I9g6irW5KzO5MUgaDeyhrNHTw2kp9TMPFC2AvEks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ku6LjKegzY8xP90GLflD6pNcdLbuYUZvZHigldSn2c6pv9jJH7PaaZWRFhFEs6AnNJY0+cBb+hJLHf36FWDy2nPabH8dbt8/82o9Nfvt1Oazl6ETP84Yb+2Q7UYUruB3Fg9LSjnahnWXx1DbOh0kD2/vVgPwLaj/+YoGX/zGbxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net; spf=pass smtp.mailfrom=crustytoothpaste.net; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b=1NeA48/j; arc=none smtp.client-ip=172.105.7.114 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="1NeA48/j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1730418579; bh=eB/I9g6irW5KzO5MUgaDeyhrNHTw2kp9TMPFC2AvEks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=1NeA48/jR2ngOFZVcYgdu9mxiIpMYILyUaDL8iSGFmdvSX3PLjWx4/df+O3/frzyW lxZfW8fBchbeZvVvSe0NxdR42MaeeZ55Kv/MGpwx1VEWaAZQcbwc3wNncn7A1sehkC 8UGfW05OVi6bUXU7D2dylkU1fHdJF0ub5h74HcG3R9FpWeJjjEFzNRUdIaztoFS6NG yncg6iqvBPRnKD/HoZXi3gRoLbXrVvpDXDtWQrmMvnaiBywXfI7XyIB1ohOJrBxd7T 2vvqpZUxfrtSA9tdn3ZMqONJN3kQTKuWV+AWEYHfGa/2xTcVM7nKgS0/o5cDWe+1Sa mKJWLvqBtKSlE6O0VRfdeXBHIuR5uGkCwl1uVOPSl1K78hKpnYOYNJY6Nlfdw7dUeG IOH4uwaiEi+rCA2BasfxOyitCuFFXlqMRteGz5al1qXt4Fv5RHoDnQWLKQjC8dXwMy yaTPXo9XwlrEpz8QRnTO+YP34ucqtmnirQ8KWDIXZUul+NknL0d Received: from tapette.crustytoothpaste.net (unknown [IPv6:2001:470:b056:101:e59a:3ed0:5f5c:31f3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by complex.crustytoothpaste.net (Postfix) with ESMTPSA id E30FB200C1; Thu, 31 Oct 2024 23:49:39 +0000 (UTC) From: "brian m. carlson" To: Cc: Junio C Hamano , Taylor Blau , Patrick Steinhardt Subject: [PATCH 1/3] gitlab-ci: switch from Ubuntu 16.04 to 20.04 Date: Thu, 31 Oct 2024 23:49:32 +0000 Message-ID: <20241031234934.3451390-2-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241031234934.3451390-1-sandals@crustytoothpaste.net> References: <20241031234934.3451390-1-sandals@crustytoothpaste.net> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Ubuntu 16.04 is past its normal LTS lifespan, so let's switch to Ubuntu 20.04 instead, which is the latest regular LTS version. Signed-off-by: brian m. carlson --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 526ecfe030..a1bc92893f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ test:linux: parallel: matrix: - jobname: linux-old - image: ubuntu:16.04 + image: ubuntu:20.04 CC: gcc - jobname: linux-sha256 image: ubuntu:latest From patchwork Thu Oct 31 23:49:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 13858505 Received: from complex.crustytoothpaste.net (complex.crustytoothpaste.net [172.105.7.114]) (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 97FD91E25FB for ; Thu, 31 Oct 2024 23:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=172.105.7.114 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418944; cv=none; b=XkLBWBg5lI6cxbNbKI/1Eaf544931c9fmHzGwd6sG5ue1yw+nQ2JJhq5N89uNG/+WYcR8B1PkAhCYhHeaEB5FmjNlNPygVrjtEdxnAoxyiDZk28E7rPA17Ro8YDSmbeNffVMkBz8FhdrqlGklxzbGAC1atQ9C1tCCr8/PXNXitY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418944; c=relaxed/simple; bh=k276l7VHj5F8rJcaSGP6dcOjaMF2d9w7qZvwVvT9JBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cSwwNjVMIaxH7aQ8g9TBkKHoHmRx/gFHDKRMxGL3khSllbL5NwPqm4mIesh7WGt2Ot5E4k/yCbtSWdTtG3240EiDowLV9KWwXegSmqimdbLRaFoR8pphkUA626uzF8E6VOnj5oOkTbS8fNsSSo2urLCwkRQvJYhUbpvi7XfKjTA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net; spf=pass smtp.mailfrom=crustytoothpaste.net; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b=FBnZWz3R; arc=none smtp.client-ip=172.105.7.114 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="FBnZWz3R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1730418580; bh=k276l7VHj5F8rJcaSGP6dcOjaMF2d9w7qZvwVvT9JBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=FBnZWz3R6cK3xF7pIf9hxkLTOuSx3GJYRNwkj7yihtYSTRjMtBuIeWCWSZB5CMUks xGiYAoEIEA8rHeFPO1kq2kZxX+dn1EL2aIXSeJbaATS+nu1nGl6X7M3WVCx16OjNVE NRf4yXW/hjwQoTyeVAJ5JJozM3n7MlOSGKDnXVnNFmPRHebS7/V2jfzyK+1RrG7bR0 utiHHFZ1f7hR/9o56bggDbOQlkSYsV+++1IyD/mT9UsA/BmypE8uYjlRgehAjv8ENG +0uOQF7CRmLMGMPfLBN0/uFwCDYrI/7Jfy2uzQmeoRBCWiXmAWcTUExTh04hyyspz1 vEQ90Kp9aqcc2ZTqr6OKkmCF8IrCi2eIfoDoOaWDoaY8heYqOB2xvdhFE/FSIGOHqi 0yJbzBHwS2tgsb9WnlD3pSeXJfUmaCUNyv1XmuWrsuAnqD+7RcN+fil3qNZuC69NEy oK4WAJamcsv0vpDvhlvGYF84KLOxw3/iaiZzUFtsoqEgszbEtjh Received: from tapette.crustytoothpaste.net (unknown [IPv6:2001:470:b056:101:e59a:3ed0:5f5c:31f3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by complex.crustytoothpaste.net (Postfix) with ESMTPSA id 0506C200C4; Thu, 31 Oct 2024 23:49:40 +0000 (UTC) From: "brian m. carlson" To: Cc: Junio C Hamano , Taylor Blau , Patrick Steinhardt Subject: [PATCH 2/3] ci: remove clause for Ubuntu 16.04 Date: Thu, 31 Oct 2024 23:49:33 +0000 Message-ID: <20241031234934.3451390-3-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241031234934.3451390-1-sandals@crustytoothpaste.net> References: <20241031234934.3451390-1-sandals@crustytoothpaste.net> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We're no longer testing this version and it's well beyond regular LTS support now, so remove the stanza for it from the case statement in our CI code. Signed-off-by: brian m. carlson --- ci/install-dependencies.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 126e570eb4..d30ae53a18 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -55,11 +55,6 @@ ubuntu-*|ubuntu32-*) ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE case "$distro" in - ubuntu-16.04) - # Does not support JGit, but we also don't really care about - # the others. We rather care whether Git still compiles and - # runs fine overall. - ;; ubuntu-*) mkdir --parents "$CUSTOM_PATH" From patchwork Thu Oct 31 23:49:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 13858504 Received: from complex.crustytoothpaste.net (complex.crustytoothpaste.net [172.105.7.114]) (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 911F71E2007 for ; Thu, 31 Oct 2024 23:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=172.105.7.114 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418943; cv=none; b=kEeA00xq4Quz1TSmSgPPH4QGoBDTJjXtuIIQAUqK9CNoRvvEw1syUj3CZy3noFKAbWh1Fav7Md2FWIOS+Ekm/rfQwAxTHVvLSIGHxHljoHMyJdgsNb0aNGlv3JlDMJkpXB+3W0/OEjXtYErWE49F2wG2NfJojodX8k+t/jEHtQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730418943; c=relaxed/simple; bh=PeGvng7K5VvLiqDYNMvtxJwPUuGzIl2i6ZzdySlWiYo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=skFY3r9DGa8pHFkWzGbVhWNc/5xCZwvfBzohTs1wYrI/RSXFbp06EaDorbMWe6mr1urlKY732y3mSnmWS+lloAews6Pg5apqbeews8xRMg+iXn0g/Cw/Hea/6q8TT1OnmsiRFPoV8weIaRtFbC5J/Oa9nGI9YmvrnE5qBdmzOSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net; spf=pass smtp.mailfrom=crustytoothpaste.net; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b=ww5+mQiK; arc=none smtp.client-ip=172.105.7.114 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=crustytoothpaste.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="ww5+mQiK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1730418580; bh=PeGvng7K5VvLiqDYNMvtxJwPUuGzIl2i6ZzdySlWiYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=ww5+mQiKihSEwUl98irr63Yw89trq6yvYlANEHL7kKoF58gv6leo8akIqQQdQD6o4 KO8ntt7pf3br4n1U16TSOm0ZRJzYSgUwjrsB+79gusZeHpgabR/Yjq+N+NMgj2gCzv yRYBmvTiMf4cOeNBnueIGaF1MdeLw3OYIOFTKK9D3QyHLipJsxWxjSOaLOHEmCmGKb EJZ+cObVPgq/oDSFnc3iTNhRlrctqwtFPpqdTdCYCFgmvFJXQ67wZjtfAv0czSCzKX dBXqal7VJFSidtNGtaO4Z2E6cbJE5qKNR6QpVIRiUS2OySO8KsC0FE2liSuStkr18M mWXPSNzO0DvDWxUvoWxWNxF6pVihuWWcfnz4qqNKztxLRDeoRWdom1QkoQwgtGU/yR JG52xrxpxgRRybZQbSlB/BFGsbN+6iORCdKygebnuIVey0oNiMU+Ws75l/8fgQDqxG mQquIMvM/atq9Xa9fdvkvDt1HTWoY0oIsj5AgHZ7hbTBjPs9Ln1 Received: from tapette.crustytoothpaste.net (unknown [IPv6:2001:470:b056:101:e59a:3ed0:5f5c:31f3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by complex.crustytoothpaste.net (Postfix) with ESMTPSA id 1A981200C5; Thu, 31 Oct 2024 23:49:40 +0000 (UTC) From: "brian m. carlson" To: Cc: Junio C Hamano , Taylor Blau , Patrick Steinhardt Subject: [PATCH 3/3] Add additional CI jobs to avoid accidental breakage Date: Thu, 31 Oct 2024 23:49:34 +0000 Message-ID: <20241031234934.3451390-4-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241031234934.3451390-1-sandals@crustytoothpaste.net> References: <20241031234934.3451390-1-sandals@crustytoothpaste.net> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In general, we'd like to make sure Git works on the LTS versions of major Linux distributions. To do that, let's add CI jobs for the oldest regular (non-extended) LTS versions of the major distributions: Ubuntu 20.04, Debian 11, and RHEL 8. Because RHEL isn't available to the public at no charge, use AlmaLinux, which is binary compatible with it. Note that Debian does not offer the language-pack packages, but suitable locale support can be installed with the locales-all package. Otherwise, use the set of installation instructions which exist and are most similar to the existing supported distros. Signed-off-by: brian m. carlson --- .github/workflows/main.yml | 9 +++++++++ ci/install-dependencies.sh | 14 ++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9301a1edd6..808ddc19b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -342,12 +342,21 @@ jobs: - jobname: linux-musl image: alpine distro: alpine-latest + # Supported until 2025-04-02. - jobname: linux32 image: i386/ubuntu:focal distro: ubuntu32-20.04 - jobname: pedantic image: fedora distro: fedora-latest + # A RHEL 8 compatible distro. Supported until 2029-05-31. + - jobname: almalinux-8 + image: almalinux:8 + distro: almalinux-8 + # Supported until 2026-08-31. + - jobname: debian-11 + image: debian:11 + distro: debian-11 env: jobname: ${{matrix.vector.jobname}} distro: ${{matrix.vector.distro}} diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d30ae53a18..d020cb7aa5 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -29,26 +29,32 @@ alpine-*) apache2 apache2-http2 apache2-proxy apache2-ssl apache2-webdav apr-util-dbd_sqlite3 \ bash cvs gnupg perl-cgi perl-dbd-sqlite perl-io-tty >/dev/null ;; -fedora-*) +fedora-*|almalinux-*) dnf -yq update >/dev/null && dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null ;; -ubuntu-*|ubuntu32-*) +ubuntu-*|ubuntu32-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. export DEBIAN_FRONTEND=noninteractive case "$distro" in ubuntu-*) SVN='libsvn-perl subversion' + LANGUAGES='language-pack-is' + ;; + ubuntu32-*) + SVN= + LANGUAGES='language-pack-is' ;; *) - SVN= + SVN='libsvn-perl subversion' + LANGUAGES='locales-all' ;; esac sudo apt-get -q update sudo apt-get -q -y install \ - language-pack-is apache2 cvs cvsps git gnupg $SVN \ + $LANGUAGES apache2 cvs cvsps git gnupg $SVN \ make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \ tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \ libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \