diff options
| -rwxr-xr-x | docker/dockerbuild.sh | 12 | ||||
| -rw-r--r-- | docker/dockerfile | 4 | ||||
| -rwxr-xr-x | repo/.gpg_keys/ffmpeg-cuda | 22 | ||||
| -rwxr-xr-x | repo/.hook/ffmpeg-cuda | 3 | ||||
| -rwxr-xr-x | utils/ng/pkgbuild.py | 6 | ||||
| -rwxr-xr-x | utils/ng/upload.py | 2 |
6 files changed, 36 insertions, 13 deletions
diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh index 091dca8..add31c5 100755 --- a/docker/dockerbuild.sh +++ b/docker/dockerbuild.sh @@ -7,11 +7,13 @@ cd /home/build git clone --depth=3 https://github.com/kunoisayami/repos pushd repos -git checkout $CHECKOUT_BRANCH +git checkout "$CHECKOUT_BRANCH" git fetch --recurse-submodules -j2 git submodule update --init popd +export DOCKER_SETUP_SCRIPT=1 + if [ $UID -eq 0 ]; then chown -R build:build repos @@ -26,17 +28,13 @@ if [ $UID -eq 0 ]; then su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build - su -c './utils/pkgbuild.sh' build - - su -e -c './utils/ci-upload.sh' build + su -c './utils/pkgbuild_bootstrap' build else echo $GPG_PRIV_KEY | base64 -d | gpg --import - ./utils/pkgbuild.sh - - ./utils/ci-upload.sh + ./utils/pkgbuild_bootstrap fi diff --git a/docker/dockerfile b/docker/dockerfile index 372fdd3..d7b613d 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -26,10 +26,10 @@ RUN if [ ! -r /home/build/hook.sh ]; then reflector --save /etc/pacman.d/mirrorl RUN pacman --noconfirm --needed -Sy archlinux-keyring -RUN pacman --noconfirm --needed -Su base-devel gnupg git yay +RUN pacman --noconfirm --needed -Su base-devel gnupg git yay python python-aiohttp python-aiofiles RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers USER build -ENTRYPOINT ["bash", "-c", "/home/build/dockerbuild.sh"] +ENTRYPOINT ["bash", "-c", "/home/build/repos/utils/ng/pkgbuild_bootstrap"] diff --git a/repo/.gpg_keys/ffmpeg-cuda b/repo/.gpg_keys/ffmpeg-cuda new file mode 100755 index 0000000..8262614 --- /dev/null +++ b/repo/.gpg_keys/ffmpeg-cuda @@ -0,0 +1,22 @@ +#!/bin/bash +cat << EOF | gpg --import +-----BEGIN PGP PUBLIC KEY BLOCK----- +mDMEYvA3sxYJKwYBBAHaRw8BAQdAhF26S5QlUZssryHGHLYw61FsF+0s54qWEDm1Rurfi5O0 +ME1pY2hhZWwgTmllZGVybWF5ZXIgPG1pY2hhZWwtZ2l0QG5pZWRlcm1heWVyLmNjPohdBBMR +CAAdFiEEn/ISixR+9nMLrfEzYR7HhwQLD6sFAmLyza8ACgkQYR7HhwQLD6u4yQCfYF35Sdk4 +7TBJPGPmimEEcm8q3S0AniMwAzbIMl/GtSEbPvE4BQkMmHdMiJYEExYIAD4WIQTdHsno3ghc +Yps+GEaxjokos5SNZAUCYvA3swIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK +CRCxjokos5SNZMozAPwNbf0yu29h2M/8K/FZOZr4wSuCQV+vHrvL7M7Svq9iZgD/Trdjuzr5 +5/RaHJ1/nGUktgWdfdnBedm5tWyMnPRZXQS0R01pY2hhZWwgTmllZGVybWF5ZXIgKGtleSB1 +c2VkIGZvciBnaXQgY29tbWl0cykgPG1pY2hhZWxAbmllZGVybWF5ZXIuY2M+iF0EExEIAB0W +IQSf8hKLFH72cwut8TNhHseHBAsPqwUCYvLNrgAKCRBhHseHBAsPq1nEAJ0c8ggnb5ZKCqM9 +IuWnjux22K01UQCfe+fU4L/lEGHPO8W7KQGY/evyMRiIlgQTFggAPhYhBN0eyejeCFximz4Y +RrGOiSizlI1kBQJi8rmoAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJELGO +iSizlI1kBjEA/3yg+uHDfCKjUmInu6NiBJz37pnBwUxjbm8UqClr60Y9AP0aifhmMgMZl5Dn +QlXed4UHmApqyoUBb4f9aJO0kW6xA7g4BGLwN7MSCisGAQQBl1UBBQEBB0A9/NW6XUXz2tw4 +1lhUMdSHkYHkmrz3qdb+Atp6EoY3EwMBCAeIeAQYFggAIBYhBN0eyejeCFximz4YRrGOiSiz +lI1kBQJi8DezAhsMAAoJELGOiSizlI1ka8kBAPpxBlsOcoG4mKUnt+Hq86KaMYfoiFHc5fjp +8lNn6TVbAPwPdZ4cskfHjJQKba9ehVaBJ2QR7XCtnE3BsapHSyTJBg== +=cRV2 +-----END PGP PUBLIC KEY BLOCK----- +EOF
\ No newline at end of file diff --git a/repo/.hook/ffmpeg-cuda b/repo/.hook/ffmpeg-cuda new file mode 100755 index 0000000..6871a1d --- /dev/null +++ b/repo/.hook/ffmpeg-cuda @@ -0,0 +1,3 @@ +#!/bin/bash +sed -i 's/make$/make -j \$\(nproc\)\n/g' PKGBUILD +sed -i 's/make /make -j \$\(nproc\) /g' PKGBUILD
\ No newline at end of file diff --git a/utils/ng/pkgbuild.py b/utils/ng/pkgbuild.py index ff52dc9..507d79c 100755 --- a/utils/ng/pkgbuild.py +++ b/utils/ng/pkgbuild.py @@ -278,7 +278,7 @@ async def run_build( return p.returncode -async def install_dep_via_yay(dep: str) -> None: +async def install_dependency_via_yay(dep: str) -> None: await ( await asyncio.create_subprocess_exec( "yay", @@ -323,7 +323,7 @@ async def do_build(target: PackageVersionWithPath) -> int: ) return ret else: - await install_dep_via_yay(dep) + await install_dependency_via_yay(dep) if ( gpg_keys := target.path.parent.joinpath(".gpg_keys") @@ -371,7 +371,7 @@ async def upload_packages() -> None: upload_token, ARCH, "--directory", - BuildEnvs.pkg_dest, + BUILD_ENVS.pkg_dest, stdout=None, ) ).wait() diff --git a/utils/ng/upload.py b/utils/ng/upload.py index 8ee5f18..07f8628 100755 --- a/utils/ng/upload.py +++ b/utils/ng/upload.py @@ -60,7 +60,7 @@ async def main(args: argparse.Namespace) -> int: if __name__ == "__main__": parser = argparse.ArgumentParser("upload.py") - parser.add_argument("remote_path") + parser.add_argument("remote_address") parser.add_argument("token") parser.add_argument("arch") parser.add_argument("--directory") |