diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 152c11a..2cb646b 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,4 +1,4 @@ -name: Test installkernel +name: ShellCheck Lint on: push: branches: [ master ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b886535..7781149 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test installkernel +name: installkernel tests on: push: branches: [ master ] @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Run tests run: ./run_tests_in_docker.sh diff --git a/Dockerfile b/Dockerfile index f0ce559..a68a02a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ RUN wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archiv && mv gentoo-master /var/db/repos/gentoo RUN echo -e "ACCEPT_KEYWORDS=\"~amd64\"\nACCEPT_LICENSE=\"*\"\nFEATURES=\"-news -sandbox -usersandbox -cgroup binpkg-multi-instance -binpkg-docompress -binpkg-dostrip parallel-install -ipc-sandbox -network-sandbox -pid-sandbox binpkg-ignore-signature buildpkg getbinpkg\"\nMAKEOPTS=\"--jobs=$(nproc) --load-average=$(nproc)\"\nUSE=\"-initramfs kernel-install boot ukify -bash dash\"" >> /etc/portage/make.conf RUN echo -e "sys-kernel/installkernel systemd -dracut -grub -systemd-boot -uki -ukify" >> /etc/portage/package.use/installkernel +RUN echo -e "sys-kernel/installkernel **" >> /etc/portage/package.accept_keywords/installkernel RUN emerge --jobs="$(nproc)" --load-average="$(nproc)" sys-kernel/gentoo-kernel-bin app-text/tree app-text/asciidoc sys-apps/systemd sys-kernel/dracut sys-boot/grub sys-kernel/installkernel sys-fs/dosfstools sys-boot/refind app-alternatives/sh CMD /tmp/installkernel-gentoo-9999/run_tests.sh - - diff --git a/installkernel-9999.ebuild b/installkernel-9999.ebuild index 2027690..3c319f8 100644 --- a/installkernel-9999.ebuild +++ b/installkernel-9999.ebuild @@ -10,13 +10,17 @@ HOMEPAGE=" https://github.com/projg2/installkernel-gentoo https://wiki.gentoo.org/wiki/Installkernel " -SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-gentoo-${PV}" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git" +else + SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify" REQUIRED_USE=" systemd-boot? ( systemd ) diff --git a/run_tests.sh b/run_tests.sh index 7cd859c..20cc09b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,8 +4,9 @@ cd /tmp || exit 1 cp /tmp/installkernel-gentoo-9999/installkernel-9999.ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 -tar -czf /var/cache/distfiles/installkernel-9999.tar.gz installkernel-gentoo-9999/. || exit 1 -ebuild /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild manifest || exit 1 + +# Modify EGIT_REPO_URI to use local path instead of GitHub +sed -i 's|EGIT_REPO_URI="https://github.com/projg2/installkernel-gentoo.git"|EGIT_REPO_URI="file:///tmp/installkernel-gentoo-9999/"|' /var/db/repos/gentoo/sys-kernel/installkernel/installkernel-9999.ebuild || exit 1 INST_KERN="$(ls /boot/kernel*-gentoo-dist* || exit 1)" INST_KV_FULL="${INST_KERN#/boot/kernel-}"