パッケージビルドを簡素化。

Author: rigaya

.github/workflows/build_base_images.yml

@@ -13,12 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - dockerimg: ubuntu2404_cuda12
-          - dockerimg: ubuntu2204_cuda11
-          - dockerimg: ubuntu2004_cuda11
-          - dockerimg: fedora39_cuda12
-          - dockerimg: fedora41_cuda12
+        include:
+          - dockerimg: ubuntu2004_cuda11
+          - dockerimg: fedora39_cuda12
 
     env:
       DOCKER_FILE: docker/docker_${{ matrix.dockerimg }}

.github/workflows/build_packages.yml

@@ -14,25 +14,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - dockerimg: ubuntu2404_cuda12
-            pkgtype: deb
-            arch: x86_64
-          - dockerimg: ubuntu2204_cuda11
-            pkgtype: deb
-            arch: x86_64
-          - dockerimg: ubuntu2004_cuda11
-            pkgtype: deb
-            arch: x86_64
-          - dockerimg: fedora39_cuda12
-            pkgtype: rpm
-            arch: x86_64
-          - dockerimg: fedora41_cuda12
-            pkgtype: rpm
-            arch: x86_64
-          #- dockerimg: ubuntu2204_cuda11_aarch64
-          #  pkgtype: deb
-          #  arch: arm64
+        include:
+          - dockerimg: ubuntu2004_cuda11
+            pkgtype: deb
+            arch: x86_64
+          - dockerimg: fedora39_cuda12
+            pkgtype: rpm
+            arch: x86_64
+          #- dockerimg: ubuntu2204_cuda11_aarch64
+          #  pkgtype: deb
+          #  arch: arm64
 
     env:
       DOCKER_IMAGE: ${{ matrix.dockerimg }}

build_deb.sh

@@ -16,13 +16,13 @@ if [ -e /etc/lsb-release ]; then
     PACKAGE_OS_CODENAME=`cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -f 2 --delim="="`
     PACKAGE_OS="_${PACKAGE_OS_ID}${PACKAGE_OS_VER}"
     if [ "${PACKAGE_OS_CODENAME}" = "focal" ]; then
-        PACKAGE_DEPENDS="libc6(>=2.29)"
+        PACKAGE_DEPENDS="libc6(>=2.31)"
     elif [ "${PACKAGE_OS_CODENAME}" = "bionic" ]; then
         PACKAGE_DEPENDS="libc6(>=2.22)"
     elif [ "${PACKAGE_OS_CODENAME}" = "jammy" ]; then
-        PACKAGE_DEPENDS="libc6(>=2.22)"
+        PACKAGE_DEPENDS="libc6(>=2.31)"
     elif [ "${PACKAGE_OS_CODENAME}" = "noble" ]; then
-        PACKAGE_DEPENDS="libc6(>=2.22)"
+        PACKAGE_DEPENDS="libc6(>=2.31)"
     else
         echo "${PACKAGE_OS_ID}${PACKAGE_OS_VER} ${PACKAGE_OS_CODENAME} not supported in this script!"
         exit 1
@@ -50,5 +50,5 @@ mkdir -p ${PACKAGE_ROOT}/usr/bin
 cp ${PACKAGE_BIN} ${PACKAGE_ROOT}/usr/bin
 chmod +x ${PACKAGE_ROOT}/usr/bin/${PACKAGE_BIN}
 
-DEB_FILE="${PACKAGE_NAME}_${PACKAGE_VERSION}${PACKAGE_OS}_${PACKAGE_ARCH}.deb"
+DEB_FILE="${PACKAGE_NAME}_${PACKAGE_VERSION}_${PACKAGE_ARCH}.deb"
 dpkg-deb -b "${PACKAGE_ROOT}" "${DEB_FILE}"

build_rpm.sh

@@ -56,6 +56,4 @@ rm -rf ${WORK_DIR}
 
 rpmbuild --define "_topdir ${RPMBUILD_DIR}" -ba "${PACKAGE_SPEC_DIR}/${PACKAGE_NAME}.spec"
 
-TARGET_RPM=`ls ${RPMBUILD_DIR}/RPMS/${PACKAGE_ARCH}/${PACKAGE_NAME}*.rpm`
-TARGET_RPM_NAME=`basename ${TARGET_RPM} .rpm`
-cp ${TARGET_RPM} ./${TARGET_RPM_NAME}-${PACKAGE_OS}.rpm
+cp ${RPMBUILD_DIR}/RPMS/${PACKAGE_ARCH}/${PACKAGE_NAME}*.rpm .