From 11dd884e5bb7fb7f0dc3fe688bc8bb64fe176674 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 31 Mar 2024 15:01:52 +0000 Subject: [PATCH 1/2] actions: prefer nvidia flavor of aws variants The "aws-*-nvidia" variants have the same settings model as their unflavored counterparts, and build a superset of the packages. For CI purposes, they provide enough coverage that there's no need to build the non-nvidia ones. Signed-off-by: Ben Cressey --- .github/actions/list-variants/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/list-variants/action.yml b/.github/actions/list-variants/action.yml index d2bc6c0b86d..a6e800c7610 100644 --- a/.github/actions/list-variants/action.yml +++ b/.github/actions/list-variants/action.yml @@ -16,7 +16,7 @@ runs: shell: bash run: | cd variants - output="variants=$(ls -d */ | cut -d'/' -f 1 | grep -vE '^(shared|target)$' | jq -R -s -c 'split("\n")[:-1]')" + output="variants=$(ls -d */ | cut -d'/' -f 1 | grep -vE '^(shared|target)$' | sort | awk '$0 != x "-nvidia" && NR>1 {print x} {x=$0} END {print}' | jq -R -s -c 'split("\n")[:-1]')" echo $output echo $output >> $GITHUB_OUTPUT output="aarch-enemies=$(ls -d */ | cut -d'/' -f 1 | grep -E '(^(metal|vmware)|\-dev$)' | jq -R -s -c 'split("\n")[:-1] | [ .[] | {"variant": ., "arch": "aarch64"}]')" From 9dd335ffabd0fb853126788118ae3e059d7df95c Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 31 Mar 2024 15:09:07 +0000 Subject: [PATCH 2/2] actions: unset upstream source fallback for nvidia The "kmod-*-nvidia" packages have `force-upstream = true` set in the build metadata. All of the other packages are expected to be in the lookaside cache. Signed-off-by: Ben Cressey --- .github/workflows/build.yml | 1 - .github/workflows/weekly.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ee66c2f59b..2cffc5532a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,5 +80,4 @@ jobs: cargo make -e BUILDSYS_VARIANT=${{ matrix.variant }} \ -e BUILDSYS_ARCH=${{ matrix.arch }} \ -e BUILDSYS_JOBS=12 \ - -e BUILDSYS_UPSTREAM_SOURCE_FALLBACK="${{ contains(matrix.variant, 'nvidia') }}" \ -e BUILDSYS_UPSTREAM_LICENSE_FETCH="${{ contains(matrix.variant, 'nvidia') }}" diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 97f33522154..125e554f3a7 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -62,5 +62,4 @@ jobs: cargo make -e BUILDSYS_VARIANT=${{ matrix.variant }} \ -e BUILDSYS_ARCH=${{ matrix.arch }} \ -e BUILDSYS_JOBS=12 \ - -e BUILDSYS_UPSTREAM_SOURCE_FALLBACK="${{ contains(matrix.variant, 'nvidia') }}" \ -e BUILDSYS_UPSTREAM_LICENSE_FETCH="${{ contains(matrix.variant, 'nvidia') }}"