diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7b170a..020b201 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,8 @@ jobs: docker run -t --privileged \ -v "$PWD":/repo \ -e PACKAGE \ - fedora:38 /bin/bash -c "/repo/build-packages.sh" + ghcr.io/t2linux/fedora-kernel-build:latest \ + /repo/build-packages.sh env: PACKAGE: ${{ matrix.package }} @@ -70,7 +71,8 @@ jobs: docker run -t \ -v $PWD:/repo \ -e RPM_SIGNING_PRIVATE_KEY_B64 \ - fedora:38 /bin/bash -c "/repo/sign-packages.sh" + ghcr.io/t2linux/fedora-kernel-build:latest \ + /repo/sign-packages.sh env: RPM_SIGNING_PRIVATE_KEY_B64: ${{ secrets.RPM_SIGNING_PRIVATE_KEY_B64 }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d2438bb..c594c26 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,8 @@ jobs: run: | docker run -t \ -v $PWD:/repo \ - fedora:38 /bin/bash -c "/repo/generate-dnf-repo.sh" + ghcr.io/t2linux/fedora-kernel-build:latest \ + /repo/generate-dnf-repo.sh - name: "Upload DNF repo" uses: actions/upload-artifact@v3 diff --git a/build-packages.sh b/build-packages.sh index c82d461..f6a964f 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -1,17 +1,6 @@ #!/usr/bin/bash source /repo/util.sh -# Install dependencies -dnf install -y --quiet koji git curl pesign rpmdevtools rpm-sign rpm-build mock zstd - -# Optimize mock -echo 'config_opts["plugin_conf"]["package_state_enable"] = False -config_opts["macros"]["%_smp_mflags"] = "-j8" -config_opts["plugin_conf"]["ccache_opts"]["compress"] = True -config_opts["plugin_conf"]["root_cache_opts"]["compress_program"] = "zstd" -config_opts["plugin_conf"]["root_cache_opts"]["extension"] = ".zst" -config_opts["plugin_conf"]["hw_info_enable"] = False' > /etc/mock/site-defaults.cfg - cd /repo if [ "$PACKAGE" == "kernel" ]; then diff --git a/generate-dnf-repo.sh b/generate-dnf-repo.sh index 31d8b6f..2381596 100755 --- a/generate-dnf-repo.sh +++ b/generate-dnf-repo.sh @@ -1,4 +1,5 @@ -dnf install -y --quiet createrepo +#!/usr/bin/bash + cd /repo mkdir ./dnf-repo && cd ./dnf-repo cp /repo/_output/*.rpm . diff --git a/sign-packages.sh b/sign-packages.sh index 485718a..7f3eb83 100755 --- a/sign-packages.sh +++ b/sign-packages.sh @@ -1,6 +1,5 @@ #!/usr/bin/bash source /repo/util.sh -dnf install --quiet -y rpm-sign rpmdevtools cd /repo/_output sign_packages $RPM_SIGNING_PRIVATE_KEY_B64 "T2Linux Fedora"