From f977ac00bb7cf2f83e233b70ca4eba22b66e6d71 Mon Sep 17 00:00:00 2001 From: syui Date: Tue, 5 Mar 2024 12:20:14 +0900 Subject: [PATCH] fix --- .gitea/workflows/release.yml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 7380475..c705743 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -20,25 +20,8 @@ jobs: - name: Initialize run: | pacman -Syuu --noconfirm base-devel archiso docker git - git clone https://gitlab.archlinux.org/archlinux/archiso - cp -rf ./cfg/profiledef.sh /usr/share/archiso/configs/releng/ - cp -rf ./cfg/profiledef.sh ./archiso/configs/releng/profiledef.sh - cp -rf ./cfg/profiledef.sh ./archiso/configs/baseline/profiledef.sh - cp -rf ./scpt/mkarchiso ./archiso/archiso/mkarchiso - ./archiso/archiso/mkarchiso -v -o ./ ./archiso/configs/releng/ - tar xf aios-bootstrap*.tar.gz - mkdir -p root.x86_64/var/lib/machines/arch - pacstrap -c root.x86_64/var/lib/machines/arch base - echo -e 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch - Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch' >> ./root.x86_64/etc/pacman.d/mirrorlist - sed -i s/CheckSpace/#CheckeSpace/ root.x86_64/etc/pacman.conf - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --init' - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --populate archlinux' - arch-chroot root.x86_64 /bin/sh -c 'pacman -Syu --noconfirm base base-devel linux vim git zsh rust openssh openssl jq go' - arch-chroot root.x86_64 /bin/sh -c 'chsh -s /bin/zsh' - arch-chroot root.x86_64 /bin/sh -c 'git clone https://git.syui.ai/ai/bot && cd bot && cargo build && cp -rf ./target/debug/ai /bin/ && ai ai' - tar -zcvf aios-bootstrap.tar.gz root.x86_64/ - tar -C ./root.x86_64 -c . | docker import - ${{ env.REGISTRY }}/${{ env.USERNAME }}/${{ env.IMAGE_NAME }} + docker pull syui/aios + docker tag syui/aios ${{ env.REGISTRY }}/${{ env.USERNAME }}/${{ env.IMAGE_NAME }}:latest - name: Log in to the Container registry uses: docker/login-action@v3 @@ -48,5 +31,4 @@ jobs: password: ${{ env.APP_TOKEN }} - name: github container registry run: | - docker push ${{ env.REGISTRY }}/${{ env.USERNAME }}/${{ env.IMAGE_NAME }} - + docker push ${{ env.REGISTRY }}/${{ env.USERNAME }}/${{ env.IMAGE_NAME }}:latest