From patchwork Fri Jul 12 20:20:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13732197 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B69573B1BC for ; Fri, 12 Jul 2024 20:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815625; cv=none; b=iDSE4KplDRN0yH8n10QxBfUAwNJgw+qlg4uYrhnuuuI2KeZ23LTvjin5Mg7bBSeqyW2aIU7QBow9LSRtueDixiQf0ZaWMw1b/xg0fmx6aqiK3fUwfsjtLOKTEWMBHAJ+NFhf/hmMm7QM20EwYHS93TQsYP6OjmfC3CaXSiErFRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815625; c=relaxed/simple; bh=0T48t6sfd0VkfPNeM5QbBtt+KDwq2Fa234DzncRZiwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JtAimIIAsk+wXOg6Up4P1g74zhtyoB2QAfu59zB4SUc62FJqJzg4OibMluzqNZ1KJG05AtN+riudzCHhVNUxOyvd0BhzpqaivnFjDXcRR6vS1z71w0SeOcRPKQ2Rm17u4vVoBYRoJl7xivzoH0rHUPfEb/wXPAl1sZh1Jn0EmTs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RQ593Ga/; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RQ593Ga/" Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3d9c487b2b5so1452681b6e.3 for ; Fri, 12 Jul 2024 13:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720815622; x=1721420422; darn=vger.kernel.org; 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=O4j1j/WYJEzLsa6TiS2XDZ2PsMffRwqUeBPYw60ayeY=; b=RQ593Ga/If3a7EeNIU1zXFdoSFuoSdMCAWaJJo4nUtDN20NNNnSfaeRaNbhv343u2V F5LvviHdIyq8VV/i6idQuK0/JFx4UZh+9oAaqgTkv4eO0VAcv8/yMSDXDj9znXnSFhsh 0JmxeRsKWhyxLGkVddki9HWfpoKeT061nNiKRajdoCHHOqn0ue5b2JIot7BbGlPTBeKR wYIAAyRSiZsLlG6+wUbojgAaIf++sl1ShIyj1l9PiHmaBG7HZFCGyW3Uv57XILDgJCbI 1/njza7vrycXQ1k2WMCuSKsgnaI8n73cl25tmmB1Z2GBtL1+4+w0O9uSp2Kp/kfd7/Dg aanA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720815622; x=1721420422; 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=O4j1j/WYJEzLsa6TiS2XDZ2PsMffRwqUeBPYw60ayeY=; b=f/UfVDFHgQ2yYnzOYA/xeRdBuskrkyTu4YVt0zHjvksNDvicIvFJ6IH69tTqF9rVOY 7fT64B8Hz7MG/wZNgZ7vQOOYHNgto67JIunPFnO6cRb4wLsnE1DqwOEgZ9936bZF9Bmd PyKuvQXe+9ZVyVo66q7KkZGRFgF+J5b9hBTbNIW8dpE5ETt+AMCZwb2qeSRiPGvqATS+ 34Ujv3NypgTpsv3V7QfroHno+o2zDnLsc98EwDY417z4EuZysxMkRpExT/eBKd0yvEiv UAiWdth0bAK6Oc5i2KYho0wvemu4uun498JSECnDBFUjudYhCw4BgD5WOG9W4plmfSZZ oI3A== X-Gm-Message-State: AOJu0YxcowcLTizYhkMpVOqAZnjLcBj+F8GTJ3eizSPY6x/pscbip3kC 6uTRRPc9HgP8H/ngRI3pMIlxGig3VuzFlmY5LZMKB95jkKG2nXiulmBapw== X-Google-Smtp-Source: AGHT+IFyy9vRAoZ984KEOoL/fGVyZODpjqtf3MtjwWUjaRHD8q7h6c8OXb/qc5GFpUxEbFjHSyiATg== X-Received: by 2002:a54:4586:0:b0:3da:82e9:ea9b with SMTP id 5614622812f47-3da82e9edbemr7454333b6e.43.1720815622045; Fri, 12 Jul 2024 13:20:22 -0700 (PDT) Received: from ldmartin-desk2.intel.com ([2600:1702:4eb6:3000::3f]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19028f7csm434473585a.67.2024.07.12.13.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 13:20:20 -0700 (PDT) From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Lucas De Marchi Subject: [PATCH 1/5] ci: Replace package installation with local action Date: Fri, 12 Jul 2024 15:20:07 -0500 Message-ID: <20240712202011.906033-2-lucas.de.marchi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712202011.906033-1-lucas.de.marchi@gmail.com> References: <20240712202011.906033-1-lucas.de.marchi@gmail.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Separate the package installation step with a local action so it's easier to support more versions and distros. Signed-off-by: Lucas De Marchi --- .github/actions/setup-ubuntu/action.yml | 22 ++++++++++++++++++++++ .github/workflows/main.yml | 18 +----------------- 2 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 .github/actions/setup-ubuntu/action.yml diff --git a/.github/actions/setup-ubuntu/action.yml b/.github/actions/setup-ubuntu/action.yml new file mode 100644 index 0000000..554d261 --- /dev/null +++ b/.github/actions/setup-ubuntu/action.yml @@ -0,0 +1,22 @@ +name: 'setup Ubuntu' +description: 'Setup an Ubuntu container for running CI' +runs: + using: 'composite' + steps: + - name: Install dependencies + shell: bash + run: | + sudo apt-get update + sudo apt-get install --yes \ + build-essential \ + autoconf \ + automake \ + gtk-doc-tools \ + libssl-dev \ + liblzma-dev \ + libssl-dev \ + libtool \ + libzstd-dev \ + linux-headers-generic \ + scdoc \ + zstd diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79eff14..fa9c9b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,23 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: install dependencies - run: | - sudo apt-get update - sudo apt-get install --yes \ - build-essential \ - autoconf \ - automake \ - gtk-doc-tools \ - libssl-dev \ - liblzma-dev \ - libssl-dev \ - libtool \ - libzstd-dev \ - linux-headers-generic \ - scdoc \ - zstd \ + - uses: ./.github/actions/setup-ubuntu - name: configure run: | From patchwork Fri Jul 12 20:20:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13732198 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B76F53B1BC for ; Fri, 12 Jul 2024 20:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815628; cv=none; b=cxnxK19P5nIrrl1XgvQNzUl1bItlB8o0mQpGi1nW/Iz5mFyyCyE6aqbx/TCM1VQOPf1Rd1llLQXTaK3IVFY9P+x5RG25V9e0ObqlPt93UR7vLI7oezwA6hzy+Nyf4cFIUIGtEHiiHOvn19OkTDWlkYxTelxbt4CVLcVCnC/B4cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815628; c=relaxed/simple; bh=yzzf76ufAJH4uyQbCgCcTB6l9lX9QcoW9B34b8dLxe8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cgcmbj7JlXR1okt/10iGlP+tEIYeRgiQbPkAYaTUmOIUNIPjxcnnkLbxw7KHRkxh/lSSpmwUjYQxCQeXw8Y6FCq5nRi1JXwIuImC5dZC314YkagVqEGkjfaYTBLY4H42iORI5S0HrmH3/5zODgmmAjfDjM2+7hNLiZ7xDWsE6o8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NLxXzDCT; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NLxXzDCT" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-79f16c85da0so164779185a.2 for ; Fri, 12 Jul 2024 13:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720815624; x=1721420424; darn=vger.kernel.org; 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=hcJzEIa4T0z9J8ekkCACO9PePAc4lrwxAI6AoQDPAjg=; b=NLxXzDCT9P9k8deme/1T9KkqlXerb+TpR8E153dfvPRkUCXPoxKP8GUTRjjIX/R+cR BrBoUmgNIS1k/iwA7F1HoHkr1bytVLurbSk85Y55vsheqCgYSJNNkkDxaE/m781gqov6 PUfsC1rTPveAjf/v4ittgA6M8kATz64mJA3uFmzOx7lzyya9XAnIo+iuADeAK0YpsHq5 pJtO5dM5SRIIP8oAqyJP+F8OqxwFW4aaylABacmmtRc19dGiulJ5XkXWnX2e4qFY4xho PDnIt/WCUVmhtld6v3Q7dIVdO0mcTMWP2PMSNMLI4qydRZoeZVcTtKp1c+BA/01NU43W GZ4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720815624; x=1721420424; 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=hcJzEIa4T0z9J8ekkCACO9PePAc4lrwxAI6AoQDPAjg=; b=HsKdK3WdM23tAgPDe6svox6rc/XGdtTcf8C9xGupZXXZGrCGLNDQc8KT1d4HQKbBCR +jxt4dG3I4+fpmJhVJXJrfG4g405oKjMCB0OfMIq15XBo6I44FxFPF2umLh6imp4fkH+ prZWvmWdhb3GwEsmG0NrG8TQBVPT5AbsenoS2IkT+AW2wyuGKzHJY0jKG2KF335voUPn CFrlq1ETkZzJJe7XxXuGBgtGrTBoCM4zgfYippN9RDpbBLUHu3akMg0gnQI6UzfWvHpC fom1RRySw7eiSKlPUC1SE7U6svUNLdlzcAqT0jtPCYsasGXdlcs6AkNFnMa1kAJV/png 26Mw== X-Gm-Message-State: AOJu0YyS5FgLA+F0W0CvBGjuRpVYvUSTYjkN5Ilh5EPWzvDIrA7srhQz JkWz5RgNbp7d7ZZr/rO6y/C71yguNKon+z6LRxG4z4u6Cl3nIExVgQgZng== X-Google-Smtp-Source: AGHT+IEGOH6ZqKsyXVOK8DXpnLHQWQBBwfAPE6gNbBSluR6RaZ0MIgGvoVWhWtofTXy4B3k2iWcRnA== X-Received: by 2002:a37:f50d:0:b0:79f:16ec:92d with SMTP id af79cd13be357-79f19a6f219mr1455060085a.27.1720815624192; Fri, 12 Jul 2024 13:20:24 -0700 (PDT) Received: from ldmartin-desk2.intel.com ([2600:1702:4eb6:3000::3f]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19028f7csm434473585a.67.2024.07.12.13.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 13:20:22 -0700 (PDT) From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Lucas De Marchi Subject: [PATCH 2/5] ci: Use a container and expand versions Date: Fri, 12 Jul 2024 15:20:08 -0500 Message-ID: <20240712202011.906033-3-lucas.de.marchi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712202011.906033-1-lucas.de.marchi@gmail.com> References: <20240712202011.906033-1-lucas.de.marchi@gmail.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use containers to build/test so it's not restricted to the OS versions supported by Github runners. A few changes are needed to the workflow to support using containers: 1) No need for sudo, so remove it 2) Explicitly install missing zlib 3) Explicitly pass KDIR= while building kernel modules, since it won't match `uname -r`. This assumes the container has just one kernel installed and so /usr/lib/modules/*/build can be used as the single symlink to the kernel headers. This should be common to other distros to be added, too. Signed-off-by: Lucas De Marchi --- .github/actions/setup-ubuntu/action.yml | 5 +++-- .github/workflows/main.yml | 11 +++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-ubuntu/action.yml b/.github/actions/setup-ubuntu/action.yml index 554d261..f60cb1d 100644 --- a/.github/actions/setup-ubuntu/action.yml +++ b/.github/actions/setup-ubuntu/action.yml @@ -6,8 +6,8 @@ runs: - name: Install dependencies shell: bash run: | - sudo apt-get update - sudo apt-get install --yes \ + apt-get update + apt-get install --yes \ build-essential \ autoconf \ automake \ @@ -19,4 +19,5 @@ runs: libzstd-dev \ linux-headers-generic \ scdoc \ + zlib1g-dev \ zstd diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa9c9b9..a9ad289 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,13 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + container: ['ubuntu:22.04', 'ubuntu:24.04'] + + container: + image: ${{ matrix.container }} + steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-ubuntu @@ -27,7 +34,7 @@ jobs: - name: test run: | cd build - make -j$(nproc) check + make KDIR=/usr/lib/modules/*/build -j$(nproc) check - name: install run: | @@ -37,4 +44,4 @@ jobs: - name: distcheck run: | cd build - make distcheck + make KDIR=/usr/lib/modules/*/build distcheck From patchwork Fri Jul 12 20:20:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13732199 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C57743CF73 for ; Fri, 12 Jul 2024 20:20:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815629; cv=none; b=hGZPBVHUgKCEC2iWz5Ms5nFNxRMUYqv6MwjVDDGrU/lUDLz57AwBEq8fMHUVopxld9FaQIhSiY5Su/J6Ro78J+SLOQ25fpleqlW8mMQbxW18onKyOUuQq5m7C9t1B2FJul0j9m2aLdXKEzsR2ZXJORKBUpyAD3oipAkyrU0dcBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815629; c=relaxed/simple; bh=L+XSuT4vneeF8lBHWGGfAoBVlCO0B3B+XkOBIYYBiWw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GK/KAa9rp/IponKhy9AHfGsp0mtyeXYyiWxJa3RW0P3KvpAnBuDRixPgKCHBMysliP1C6ZDdSHRVo4JMrg0hs8UJTPmaY5CiembqKEnCmsgZ3JR3BDumMvNftzWHMdl5GjNftUjiHtzAH9UQchHRjDfJwUFmswSrk/GXnNpR9sQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HnaUYLvz; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HnaUYLvz" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-79ef7ecc7d4so157564785a.0 for ; Fri, 12 Jul 2024 13:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720815626; x=1721420426; darn=vger.kernel.org; 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=tg07oqyKLj2o7G9r/7jnxWukDrSmFxz1BaFJY/9vu6Q=; b=HnaUYLvzHh/KJ16K/qIqGPbCZ5/5za7/i0s51z7TzQ7QnWZddU3R01DW30FDOD88T+ z4uimOp+Grlv5cK3GoK0QawXsjaEht0gZ1yUqOkqPJ14nHRolwHY4DhaughvbuLPWUmP sfm1oU8flunui1j9UuMMTb0Wp/UEjZmKvTbXDxVROjP0AMST+MSLqXKyVxop5fk70koQ lMQ96swQquzxn8+fTlENwCVUpR3G9Qw/BWla83wQaG9W2sUhOzYIcYrFbs070D8F+Ut6 /9HUbIKQJOfCsFUoVkLmdXP5/feB8D7spffmCSuTzKmF9uQS77hmQ2OVssV3GMTjKNWl EQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720815626; x=1721420426; 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=tg07oqyKLj2o7G9r/7jnxWukDrSmFxz1BaFJY/9vu6Q=; b=tZPHTgs4ofmDsjpnjDclnSjdY6RwNaUZXXDoIBwgkWkILMzSTnEkBbFxHPsOiNYMJe hrz2wbfrulv8W4TjiDIlqBWiJO1by+O2KXbGe49i77wiPxeSpEoj2FbW5W3NB2JTeLK3 sdxptOuaPzdB00X1LdCfQ2fNUiE8QiQsH3WcgEnId7+JbB9zWQQBAd6DUis1ZO4WsZMm NnqL6KbTQsJMFAI3DTMYJp0i8/Io0gaHyPt79sslqK74majkjCXViA+qNKMyxjG4Tut/ imI6HBUpez7biW6D7IVEIw4kMxIBFmX9jgUDXJjD5sYhYY8YYiVmJPwExNa1bEjawE78 gfpQ== X-Gm-Message-State: AOJu0YyPMQeUtJc9lM/C1DBtDAE9ows52Dn6KlG9gOuJ3uA7y/0p7zrE xWeM+WgsLXKCaJsTAS2eZNiufFYeNIHbSQuCHBsgkindTGaUSAUxjHuQsw== X-Google-Smtp-Source: AGHT+IEInglDZE++zREXnxhLC8aZ/Qd4dLNNrqmZkkQf5GjI57Z0LL0EXoK7VIna+Up7uPc4elEspw== X-Received: by 2002:a05:620a:5d:b0:79d:7a40:1bde with SMTP id af79cd13be357-79f19a50927mr1379189685a.45.1720815625948; Fri, 12 Jul 2024 13:20:25 -0700 (PDT) Received: from ldmartin-desk2.intel.com ([2600:1702:4eb6:3000::3f]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19028f7csm434473585a.67.2024.07.12.13.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 13:20:24 -0700 (PDT) From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Lucas De Marchi Subject: [PATCH 3/5] ci: Add Archlinux Date: Fri, 12 Jul 2024 15:20:09 -0500 Message-ID: <20240712202011.906033-4-lucas.de.marchi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712202011.906033-1-lucas.de.marchi@gmail.com> References: <20240712202011.906033-1-lucas.de.marchi@gmail.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add an action to setup Archlinux and use it for the initial setup. The rest of the workflow can stay the same. Signed-off-by: Lucas De Marchi --- .github/actions/setup-archlinux/action.yml | 16 ++++++++++++++++ .github/workflows/main.yml | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .github/actions/setup-archlinux/action.yml diff --git a/.github/actions/setup-archlinux/action.yml b/.github/actions/setup-archlinux/action.yml new file mode 100644 index 0000000..9b22a9a --- /dev/null +++ b/.github/actions/setup-archlinux/action.yml @@ -0,0 +1,16 @@ +name: 'setup Archlinux' +description: 'Setup an Archlinux container for running CI' +runs: + using: 'composite' + steps: + - name: Install dependencies + shell: bash + run: | + rm -rf /etc/pacman.d/gnupg + pacman-key --init + pacman-key --populate + pacman --noconfirm -Sy archlinux-keyring + pacman --noconfirm -Su \ + linux-headers \ + scdoc \ + gtk-doc diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a9ad289..3f8eaa6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,14 +11,18 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - container: ['ubuntu:22.04', 'ubuntu:24.04'] + container: ['ubuntu:22.04', 'ubuntu:24.04', 'archlinux:base-devel'] container: image: ${{ matrix.container }} steps: - uses: actions/checkout@v4 + - uses: ./.github/actions/setup-ubuntu + if: ${{ startsWith(matrix.container, 'ubuntu') }} + - uses: ./.github/actions/setup-archlinux + if: ${{ startsWith(matrix.container, 'archlinux') }} - name: configure run: | From patchwork Fri Jul 12 20:20:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13732200 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC8FD3CF73 for ; Fri, 12 Jul 2024 20:20:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815631; cv=none; b=U0Z9ikv02LAcj8WtOywFipGl+Q9sR9DOJeoQfkn688FoNbvYOsPLlReWFl1RBaE8Tdm6LWr1GIavBe3cNfW6eJBbdkkvXM47Zdi71jI/1fsOsMMy0Jf0hQAQk10RfiYggAv4CKKubHmr252QUYNLpdcvzaGJVBgB5W3cXNQP24A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815631; c=relaxed/simple; bh=/PScWKQ6JRaowVmLZ34PxYDPysAZLFtS/ZszCOYeC+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tWI374Z0XH7qLj/BLCJwb18eMtihFOggo/bCjuL1i5XMSOWkJh5V2L8a4IQJDkXWZ4Haan+yZJ69/wYvApJBLcsqEDLEmM/Zev9ntCwMW7QMR6mnSJADSL9D0mKPLDL0346M4+KwclC6G+QTtJLTD4B5n01tkHQJmFfHb5zP1ao= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fqpELh4n; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fqpELh4n" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-79f17d6be17so162796785a.1 for ; Fri, 12 Jul 2024 13:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720815628; x=1721420428; darn=vger.kernel.org; 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=C3ZloF0N7zIHm56oe3UDqWfxOCcu4B5Cilc20tAHFiw=; b=fqpELh4nPAqIo0rSqsXaThkUm9pFm7dy1Xwng93qGBconPuAbdoDsak/5qM6ZpGIDu WB57JJNtTWKaC9B7AiccL17cqhW7h83hZSVNMluVt45NDjmc4mWAbBy3Pz0lhMH2cF9c YTf3hNYqDW734q/DSFSjJJuMpM9uHVyJa8Ts6PeiN7d8/ihmvCwng6cznNcH1Mt5Y13C aHpzfCgxwXrkitkW6+lI+jU2GYotlh72bWOBSjWrjFGhD63ha1cdIa0Wk8xEvKhnyozY 2JJQ8Kz3yW6XVh3xqzZc0GRPz1QAsCvZd8i+laAVVIXIL+m5KSzmVtdSwIDJrBumvEJF axaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720815628; x=1721420428; 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=C3ZloF0N7zIHm56oe3UDqWfxOCcu4B5Cilc20tAHFiw=; b=IwqKagRLR1uYZACJrxXKvVV6EBK2MG7g1hzQCMfK+kHY7HhZ1W6TMPEMfKkvjws3Jf MtMu5qJZ44rHYDUagVDSkMrJfurv36fFB6GiNzdYZd+/LWgUadKrlwzGbLK4qnWiEyfS m0UuTyXkC6BPDtsWXOdRHZOlPM2eU6vtn18l4oM/AFvPHIX9QGMR78YAkHnE3eC4G/yH KDDnKOWsbOGQrnE7J7Zn6sFyF+wE8b8Yk8DxqACyOBDwEuqizJSy0pA3KkgZttOXIPm6 oZbVj3oPEPpM8ayqMA0wJKKbiIVaE1YT2siPkTBb7DoatqIrEniNDf+h8VDBXr9BKAfg CreA== X-Gm-Message-State: AOJu0YzlI2tl+TqUxNRrBsmYXaSkMCUTgYAFVeY1FIJP69NFYmTwOmWX B9XQc6VseYRU/nDPRJy9dXParpfqbrRdqhESMde6TpkPpAGzMPIMyX2GAA== X-Google-Smtp-Source: AGHT+IH64Bho6IBwjAPsOkOCwKoDKOESlZD2BQAPya3yhRTMLaH5nnVjSSRCs++36a2K/sIz6QglAA== X-Received: by 2002:a05:620a:45a9:b0:79d:6cb6:a7b8 with SMTP id af79cd13be357-79f19a51d4bmr1835832485a.1.1720815627994; Fri, 12 Jul 2024 13:20:27 -0700 (PDT) Received: from ldmartin-desk2.intel.com ([2600:1702:4eb6:3000::3f]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19028f7csm434473585a.67.2024.07.12.13.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 13:20:26 -0700 (PDT) From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Lucas De Marchi Subject: [PATCH 4/5] ci: Add Fedora Date: Fri, 12 Jul 2024 15:20:10 -0500 Message-ID: <20240712202011.906033-5-lucas.de.marchi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712202011.906033-1-lucas.de.marchi@gmail.com> References: <20240712202011.906033-1-lucas.de.marchi@gmail.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add an action to setup latest Fedora and use it for the initial setup. Add hack on /usr/lib/modules so /usr/lib/modules/*/build can still be used in the rest of the workflow as the KDIR. Signed-off-by: Lucas De Marchi --- .github/actions/setup-fedora/action.yml | 27 +++++++++++++++++++++++++ .github/workflows/main.yml | 4 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/actions/setup-fedora/action.yml diff --git a/.github/actions/setup-fedora/action.yml b/.github/actions/setup-fedora/action.yml new file mode 100644 index 0000000..a2612e4 --- /dev/null +++ b/.github/actions/setup-fedora/action.yml @@ -0,0 +1,27 @@ +name: 'setup Fedora' +description: 'Setup a Fedora container for running CI' +runs: + using: 'composite' + steps: + - name: Install dependencies + shell: bash + run: | + dnf update -y + dnf install -y \ + autoconf \ + automake \ + make \ + gcc \ + kernel-devel \ + zlib-devel \ + xz-devel \ + libzstd-devel \ + openssl-devel \ + gtk-doc \ + libtool \ + scdoc + # CI builds with KDIR pointing to /usr/lib/modules/*/build + # so just a foo/build pointing to the right place, assuming + # just one kernel installed + mkdir -p /usr/lib/modules/foo/ + ln -s /usr/src/kernels/* /usr/lib/modules/foo/build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f8eaa6..4a2fff2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - container: ['ubuntu:22.04', 'ubuntu:24.04', 'archlinux:base-devel'] + container: ['ubuntu:22.04', 'ubuntu:24.04', 'archlinux:base-devel', 'fedora:latest'] container: image: ${{ matrix.container }} @@ -23,6 +23,8 @@ jobs: if: ${{ startsWith(matrix.container, 'ubuntu') }} - uses: ./.github/actions/setup-archlinux if: ${{ startsWith(matrix.container, 'archlinux') }} + - uses: ./.github/actions/setup-fedora + if: ${{ startsWith(matrix.container, 'fedora') }} - name: configure run: | From patchwork Fri Jul 12 20:20:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 13732201 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 291343C062 for ; Fri, 12 Jul 2024 20:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815632; cv=none; b=cRkBdYaFFAKhyBbSMYOr3oC3r/rSw/4I7xcrGTyNghQpIx/4cCXN2Ju7/x9ZXJPK98zbjLcqLtbyld/dF6Ziig2WgOfCFYNgHG/fhcAFY3iTNQw5VDQmgkKnCkHRAcLw8gjpWyq25nKlVs82I/l2K9+S56itriQhHmGEAfHrjto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720815632; c=relaxed/simple; bh=jgd6Ar3mjHxEU4gvhyzDWcNIBSGlMr5exCrEb4AilVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I6bKQrkiE5TW0J8BUMt/yOZNztyb7MlBsqwUTeBCEKOfmMJiY48KEdX796dhIvkJVf19Oji6+RSasc+xazapjeMmoG2dQwqO6rHdNFJgTQPCOt1xg6unOAwmxNci81Ul6xGURfATiCKEH/8RCg1+pKIo6SUL9irWpRfaspRBzL4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k17lnnpe; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k17lnnpe" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-79ef82c6391so127048785a.3 for ; Fri, 12 Jul 2024 13:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720815630; x=1721420430; darn=vger.kernel.org; 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=rsayz27AEK0ZUF0FdWJVnVPT8Q1Wqz0KnZfkRPataDo=; b=k17lnnpe+XV4wlk1YOMr3zPnxZZwTlQKMz5jkbyb8stRWnU7MXs5rJcUxBWJZ8BbRU lorf3+30+cACOmFFYD7AoQ/p3Ecy0wITkSStcy8T8i712o87fVDoGCgVwJcQ2gfL9QkM JThRIe06rulR0GGzl8J2/kuQScOYH4GMkOOxhdOKlkwutG8IOTnzcys7KQxDTvYqla1+ If4G141wEV6LyICvAjJpuuodqNbsX+jw7a4v7duXZ/bqPVO4VYNZtzaB+NJsaommWPaf 2OpyQvjoGKH622NkfqDBK8msi0GO4j2PrkqMg3lbzuzz4TlCXw1c7jXIUWsKdHQaUvLf fBXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720815630; x=1721420430; 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=rsayz27AEK0ZUF0FdWJVnVPT8Q1Wqz0KnZfkRPataDo=; b=HKfw6DAlXzDnFNGb4GaVBmgivjGttZZumsasO1+K/aJFpRw6IOuN39k/EER0qHzB1l zrd05TubSbXsbUL4OByrpjHaxOSxn+r3vbGyUIV+FxKl2Nn23vKo4C8s6HtkqAlgzSCu 7INFSxY8xc4CX3ZRBuKSihBSg/ddnWz6MZT386QhGBUkFgOR5X36RSQ6oAE3jW+lpHZj /KxNOyCARwTFcWoAwz0q4cwyGwNUMTLkw3lKFthoPT3PRHROadDmRwg5bFj5CEtjDlD6 BThTzl5XwShabPhKhPFuibYXaoNuDIYGZeQDoA2vXsPFBc0QIsQpOnLn18scW67bk/Dg 7zHA== X-Gm-Message-State: AOJu0YzhvTt2sCJEWm8or0ZHGLG3IupNVnN5Kw3EaoGC80oaeVTFZJBj 6/4jvbGHvFT0IAqQ95uT7sJsHdNQcyrqCpEGbCND3ucdg7Svp73VRSkGrg== X-Google-Smtp-Source: AGHT+IE3W+7ucp/82UBVPXsjQuw5LFvYIsgnE0cSH3W6VD6hw4HqpXKYpD6SZI0BdAgxbkDOTE+nfg== X-Received: by 2002:a05:620a:2482:b0:79e:f930:535e with SMTP id af79cd13be357-79f19a71793mr1878563885a.27.1720815629677; Fri, 12 Jul 2024 13:20:29 -0700 (PDT) Received: from ldmartin-desk2.intel.com ([2600:1702:4eb6:3000::3f]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f19028f7csm434473585a.67.2024.07.12.13.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 13:20:28 -0700 (PDT) From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Lucas De Marchi Subject: [PATCH 5/5] ci: Add Alpine Date: Fri, 12 Jul 2024 15:20:11 -0500 Message-ID: <20240712202011.906033-6-lucas.de.marchi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712202011.906033-1-lucas.de.marchi@gmail.com> References: <20240712202011.906033-1-lucas.de.marchi@gmail.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add setup action for Alpine and start building it. Unfortunately the testsuite is not ready yet and fails to build like this: ../testsuite/path.c:219:14: error: conflicting types for '__xstat64'; have 'int(int, const char *, struct stat64 *)' 219 | WRAP_VERSTAT(__x,64); | ^~~ Add everything needed on the setup action, so when the underlying issue is fixed, the testsuite can be enabled in CI. Signed-off-by: Lucas De Marchi --- .github/actions/setup-alpine/action.yml | 22 ++++++++++++++++++++++ .github/workflows/main.yml | 16 +++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .github/actions/setup-alpine/action.yml diff --git a/.github/actions/setup-alpine/action.yml b/.github/actions/setup-alpine/action.yml new file mode 100644 index 0000000..1c7eae9 --- /dev/null +++ b/.github/actions/setup-alpine/action.yml @@ -0,0 +1,22 @@ +name: 'setup Alpine' +description: 'Setup an Alpine container for running CI' +runs: + using: 'composite' + steps: + - name: Install dependencies + shell: sh + run: | + apk update + apk add \ + autoconf \ + automake \ + bash \ + build-base \ + gtk-doc \ + libtool \ + linux-edge-dev \ + openssl-dev \ + scdoc \ + xz-dev \ + zlib-dev \ + zstd-dev diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a2fff2..b4ad5cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - container: ['ubuntu:22.04', 'ubuntu:24.04', 'archlinux:base-devel', 'fedora:latest'] + include: + - container: 'ubuntu:22.04' + test: 'yes' + - container: 'ubuntu:24.04' + test: 'yes' + - container: 'archlinux:base-devel' + test: 'yes' + - container: 'fedora:latest' + test: 'yes' + - container: 'alpine:latest' + test: 'no' container: image: ${{ matrix.container }} @@ -25,6 +35,8 @@ jobs: if: ${{ startsWith(matrix.container, 'archlinux') }} - uses: ./.github/actions/setup-fedora if: ${{ startsWith(matrix.container, 'fedora') }} + - uses: ./.github/actions/setup-alpine + if: ${{ startsWith(matrix.container, 'alpine') }} - name: configure run: | @@ -38,6 +50,7 @@ jobs: make -j$(nproc) - name: test + if: ${{ matrix.test == 'yes' }} run: | cd build make KDIR=/usr/lib/modules/*/build -j$(nproc) check @@ -48,6 +61,7 @@ jobs: DESTDIR=$PWD/inst make install - name: distcheck + if: ${{ matrix.test == 'yes' }} run: | cd build make KDIR=/usr/lib/modules/*/build distcheck