diff --git a/.github/workflows/build-akmods-centos-kmodsig.yml b/.github/workflows/build-akmods-centos-kmodsig.yml deleted file mode 100644 index 6da36829..00000000 --- a/.github/workflows/build-akmods-centos-kmodsig.yml +++ /dev/null @@ -1,90 +0,0 @@ ---- -# -# WARNING THIS IS A GENERATED WORKFLOW. DO NOT EDIT BY HAND! -# -# Generate the workflow by running `just generate-workflows` at git root -# Modify the inputs in workflow-templates -name: Build CENTOS-KMODSIG akmods -on: - merge_group: - pull_request: - branches: - - main - paths-ignore: - - '**.md' - schedule: - - cron: '16 0 * * *' # 0016 UTC everyday - workflow_dispatch: -jobs: - cache_kernel_centos-kmodsig_10: - name: Cache centos-kmodsig (10) - uses: ./.github/workflows/reusable-cache-kernel.yml - secrets: inherit - permissions: - actions: read - contents: read - packages: write - with: - architecture: '["aarch64","x86_64"]' - kernel_flavor: centos-kmodsig - version: 10 - build-centos-kmodsig_10_nvidia: - name: Build nvidia centos-kmodsig (10) - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - permissions: - actions: read - contents: read - packages: write - needs: cache_kernel_centos-kmodsig_10 - with: - akmods_target: nvidia - architecture: '["aarch64","x86_64"]' - kernel_cache_key: ${{ needs.cache_kernel_centos-kmodsig_10.outputs.KCKEY }} - kernel_flavor: centos-kmodsig - version: 10 - build-centos-kmodsig_10_nvidia-open: - name: Build nvidia-open centos-kmodsig (10) - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - permissions: - actions: read - contents: read - packages: write - needs: cache_kernel_centos-kmodsig_10 - with: - akmods_target: nvidia-open - architecture: '["aarch64","x86_64"]' - kernel_cache_key: ${{ needs.cache_kernel_centos-kmodsig_10.outputs.KCKEY }} - kernel_flavor: centos-kmodsig - version: 10 - build-centos-kmodsig_10_zfs: - name: Build zfs centos-kmodsig (10) - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - permissions: - actions: read - contents: read - packages: write - needs: cache_kernel_centos-kmodsig_10 - with: - akmods_target: zfs - architecture: '["aarch64","x86_64"]' - kernel_cache_key: ${{ needs.cache_kernel_centos-kmodsig_10.outputs.KCKEY }} - kernel_flavor: centos-kmodsig - version: 10 - check-centos-kmodsig_10: - name: Check centos-kmodsig (10) - permissions: - actions: read - contents: read - needs: [build-centos-kmodsig_10_nvidia,build-centos-kmodsig_10_nvidia-open,build-centos-kmodsig_10_zfs] - runs-on: ubuntu-24.04 - if: always() - steps: - - name: Check for Build Failures - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') - run: exit 1 - - - name: Exit if Success - run: exit 0 diff --git a/.github/workflows/build-akmods-coreos-stable.yml b/.github/workflows/build-akmods-coreos-stable.yml index 77826c7e..9442d242 100644 --- a/.github/workflows/build-akmods-coreos-stable.yml +++ b/.github/workflows/build-akmods-coreos-stable.yml @@ -16,6 +16,93 @@ on: - cron: '19 0 * * *' # 0019 UTC everyday workflow_dispatch: jobs: + cache_kernel_coreos-stable_43: + name: Cache coreos-stable (43) + uses: ./.github/workflows/reusable-cache-kernel.yml + secrets: inherit + permissions: + actions: read + contents: read + packages: write + with: + architecture: '["aarch64","x86_64"]' + kernel_flavor: coreos-stable + version: 43 + build-coreos-stable_43_common: + name: Build common coreos-stable (43) + uses: ./.github/workflows/reusable-build.yml + secrets: inherit + permissions: + actions: read + contents: read + packages: write + needs: cache_kernel_coreos-stable_43 + with: + akmods_target: common + architecture: '["aarch64","x86_64"]' + kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }} + kernel_flavor: coreos-stable + version: 43 + build-coreos-stable_43_nvidia: + name: Build nvidia coreos-stable (43) + uses: ./.github/workflows/reusable-build.yml + secrets: inherit + permissions: + actions: read + contents: read + packages: write + needs: cache_kernel_coreos-stable_43 + with: + akmods_target: nvidia + architecture: '["aarch64","x86_64"]' + kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }} + kernel_flavor: coreos-stable + version: 43 + build-coreos-stable_43_nvidia-open: + name: Build nvidia-open coreos-stable (43) + uses: ./.github/workflows/reusable-build.yml + secrets: inherit + permissions: + actions: read + contents: read + packages: write + needs: cache_kernel_coreos-stable_43 + with: + akmods_target: nvidia-open + architecture: '["aarch64","x86_64"]' + kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }} + kernel_flavor: coreos-stable + version: 43 + build-coreos-stable_43_zfs: + name: Build zfs coreos-stable (43) + uses: ./.github/workflows/reusable-build.yml + secrets: inherit + permissions: + actions: read + contents: read + packages: write + needs: cache_kernel_coreos-stable_43 + with: + akmods_target: zfs + architecture: '["aarch64","x86_64"]' + kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }} + kernel_flavor: coreos-stable + version: 43 + check-coreos-stable_43: + name: Check coreos-stable (43) + permissions: + actions: read + contents: read + needs: [build-coreos-stable_43_common,build-coreos-stable_43_nvidia,build-coreos-stable_43_nvidia-open,build-coreos-stable_43_zfs] + runs-on: ubuntu-24.04 + if: always() + steps: + - name: Check for Build Failures + if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') + run: exit 1 + + - name: Exit if Success + run: exit 0 cache_kernel_coreos-stable_42: name: Cache coreos-stable (42) uses: ./.github/workflows/reusable-cache-kernel.yml diff --git a/build_files/nvidia/build-kmod-nvidia.sh b/build_files/nvidia/build-kmod-nvidia.sh index 420c50f6..fb76da9c 100755 --- a/build_files/nvidia/build-kmod-nvidia.sh +++ b/build_files/nvidia/build-kmod-nvidia.sh @@ -22,8 +22,13 @@ cd /tmp ### BUILD nvidia +# query latest available driver in repo +DRIVER_VERSION=$(dnf info nvidia-driver | grep -E '^Version|^Release' | awk '{print $3}' | xargs | sed 's/\ /-/') + +# only install the version of akmod-nviida which matches available nvidia-driver +# this works around situations where a new version may be released but not for one arch dnf install -y \ - "akmod-nvidia*.${DIST}.${ARCH}" + "akmod-nvidia-${DRIVER_VERSION}" # Either successfully build and install the kernel modules, or fail early with debug output rpm -qa |grep nvidia diff --git a/build_files/prep/build-prep.sh b/build_files/prep/build-prep.sh index 8f3818da..5abb2922 100755 --- a/build_files/prep/build-prep.sh +++ b/build_files/prep/build-prep.sh @@ -42,8 +42,8 @@ echo "Installing ${KERNEL_FLAVOR} kernel-cache RPMs..." #shellcheck disable=SC2046 #we want word splitting dnf install -y --allowerasing --setopt=install_weak_deps=False "${PREP_RPMS[@]}" $(find /tmp/kernel_cache/*.rpm -type f | grep "$(uname -m)" | grep -v uki | xargs) -# after F43 launches, bump to 44 -if [[ "${VERSION}" -ge 43 && -f /etc/fedora-release ]]; then +# after F44 launches, bump to 45 +if [[ "${VERSION}" -ge 44 && -f /etc/fedora-release ]]; then # pre-release rpmfusion is in a different location sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo # pre-release rpmfusion needs to enable testing diff --git a/build_files/test/test-prep.sh b/build_files/test/test-prep.sh index b0b491c6..117007ec 100755 --- a/build_files/test/test-prep.sh +++ b/build_files/test/test-prep.sh @@ -58,8 +58,8 @@ else fedora-repos-archive ) - # after F43 launches, bump to 44 - if [[ "${RELEASE}" -ge 43 ]]; then + # after F44 launches, bump to 45 + if [[ "${RELEASE}" -ge 44 ]]; then COPR_RELEASE="rawhide" else COPR_RELEASE="${RELEASE}" @@ -78,8 +78,8 @@ else "https://negativo17.org/repos/fedora-multimedia.repo" fi -# after F43 launches, bump to 44 -if [[ "${RELEASE}" -ge 43 && -f /etc/fedora-release ]]; then +# after F44 launches, bump to 45 +if [[ "${RELEASE}" -ge 44 && -f /etc/fedora-release ]]; then # pre-release rpmfusion is in a different location sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo # pre-release rpmfusion needs to enable testing diff --git a/images.yaml b/images.yaml index 9103282c..327d6eeb 100644 --- a/images.yaml +++ b/images.yaml @@ -1,7 +1,7 @@ --- defaults: kernel_flavor: main - version: 42 + version: 43 akmods_target: common arch-arm-x86: &arch-arm-x86 @@ -108,9 +108,6 @@ images: centos: !!merge <<: - *server-build-group-arm-x86 - centos-kmodsig: - !!merge <<: - - *server-build-group-arm-x86 42: main: !!merge <<: @@ -119,15 +116,14 @@ images: !!merge <<: - *desktop-build-group-arm-x86 - *server-build-group-arm-x86 - "longterm-6.12": - !!merge <<: - - *desktop-build-group-arm-x86 - - *server-build-group-arm-x86 - 43: main: !!merge <<: - *desktop-build-group + coreos-stable: + !!merge <<: + - *desktop-build-group-arm-x86 + - *server-build-group-arm-x86 coreos-testing: !!merge <<: - *desktop-build-group-arm-x86