diff --git a/.github/workflows/build-0.yml b/.github/workflows/build-0.yml index 7eced58..d109ec9 100644 --- a/.github/workflows/build-0.yml +++ b/.github/workflows/build-0.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 0 diff --git a/.github/workflows/build-1.yml b/.github/workflows/build-1.yml index 2b745b4..802b683 100644 --- a/.github/workflows/build-1.yml +++ b/.github/workflows/build-1.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 1 diff --git a/.github/workflows/build-2.yml b/.github/workflows/build-2.yml index 2d140ca..a561c9f 100644 --- a/.github/workflows/build-2.yml +++ b/.github/workflows/build-2.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 2 diff --git a/.github/workflows/build-3.yml b/.github/workflows/build-3.yml index f6fc37e..99cb1e1 100644 --- a/.github/workflows/build-3.yml +++ b/.github/workflows/build-3.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 3 diff --git a/.github/workflows/build-4.yml b/.github/workflows/build-4.yml index d15ff72..f502cc2 100644 --- a/.github/workflows/build-4.yml +++ b/.github/workflows/build-4.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 4 diff --git a/.github/workflows/build-5.yml b/.github/workflows/build-5.yml index ff40781..81c9412 100644 --- a/.github/workflows/build-5.yml +++ b/.github/workflows/build-5.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 5 diff --git a/.github/workflows/build-6.yml b/.github/workflows/build-6.yml index e8c4671..bf8a701 100644 --- a/.github/workflows/build-6.yml +++ b/.github/workflows/build-6.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 6 diff --git a/.github/workflows/build-7.yml b/.github/workflows/build-7.yml index 236318a..f3ea458 100644 --- a/.github/workflows/build-7.yml +++ b/.github/workflows/build-7.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 7 diff --git a/.github/workflows/build-hwe-0.yml b/.github/workflows/build-hwe-0.yml index 0c3359f..a32414d 100644 --- a/.github/workflows/build-hwe-0.yml +++ b/.github/workflows/build-hwe-0.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 0 1 diff --git a/.github/workflows/build-hwe-1.yml b/.github/workflows/build-hwe-1.yml index cbc725d..3b6cc00 100644 --- a/.github/workflows/build-hwe-1.yml +++ b/.github/workflows/build-hwe-1.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 1 1 diff --git a/.github/workflows/build-hwe-2.yml b/.github/workflows/build-hwe-2.yml index 22df67f..ad90ff5 100644 --- a/.github/workflows/build-hwe-2.yml +++ b/.github/workflows/build-hwe-2.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 2 1 diff --git a/.github/workflows/build-hwe-3.yml b/.github/workflows/build-hwe-3.yml index e85c153..5b798ff 100644 --- a/.github/workflows/build-hwe-3.yml +++ b/.github/workflows/build-hwe-3.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 3 1 diff --git a/.github/workflows/build-hwe-4.yml b/.github/workflows/build-hwe-4.yml index e35e7d0..8e88324 100644 --- a/.github/workflows/build-hwe-4.yml +++ b/.github/workflows/build-hwe-4.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 4 1 diff --git a/.github/workflows/build-hwe-5.yml b/.github/workflows/build-hwe-5.yml index 7aa8ae4..232df76 100644 --- a/.github/workflows/build-hwe-5.yml +++ b/.github/workflows/build-hwe-5.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 5 1 diff --git a/.github/workflows/build-hwe-6.yml b/.github/workflows/build-hwe-6.yml index f78845a..db32a73 100644 --- a/.github/workflows/build-hwe-6.yml +++ b/.github/workflows/build-hwe-6.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 6 1 diff --git a/.github/workflows/build-hwe-7.yml b/.github/workflows/build-hwe-7.yml index 24a8a0a..880a551 100644 --- a/.github/workflows/build-hwe-7.yml +++ b/.github/workflows/build-hwe-7.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action.sh 7 1 diff --git a/.github/workflows/build-xanmod-0.yml b/.github/workflows/build-xanmod-0.yml index 51be95e..59c0d34 100644 --- a/.github/workflows/build-xanmod-0.yml +++ b/.github/workflows/build-xanmod-0.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 0 diff --git a/.github/workflows/build-xanmod-1.yml b/.github/workflows/build-xanmod-1.yml index fd3e57d..d469324 100644 --- a/.github/workflows/build-xanmod-1.yml +++ b/.github/workflows/build-xanmod-1.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 1 diff --git a/.github/workflows/build-xanmod-2.yml b/.github/workflows/build-xanmod-2.yml index c8a89d3..18ad345 100644 --- a/.github/workflows/build-xanmod-2.yml +++ b/.github/workflows/build-xanmod-2.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 2 diff --git a/.github/workflows/build-xanmod-3.yml b/.github/workflows/build-xanmod-3.yml index 9cd8424..5e12811 100644 --- a/.github/workflows/build-xanmod-3.yml +++ b/.github/workflows/build-xanmod-3.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 3 diff --git a/.github/workflows/build-xanmod-hwe0.yml b/.github/workflows/build-xanmod-hwe0.yml index 03c9fd7..8c131bb 100644 --- a/.github/workflows/build-xanmod-hwe0.yml +++ b/.github/workflows/build-xanmod-hwe0.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 0 1 diff --git a/.github/workflows/build-xanmod-hwe1.yml b/.github/workflows/build-xanmod-hwe1.yml index 142a49d..8c65aa4 100644 --- a/.github/workflows/build-xanmod-hwe1.yml +++ b/.github/workflows/build-xanmod-hwe1.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 1 1 diff --git a/.github/workflows/build-xanmod-hwe2.yml b/.github/workflows/build-xanmod-hwe2.yml index 498dab3..69959b3 100644 --- a/.github/workflows/build-xanmod-hwe2.yml +++ b/.github/workflows/build-xanmod-hwe2.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 2 1 diff --git a/.github/workflows/build-xanmod-hwe3.yml b/.github/workflows/build-xanmod-hwe3.yml index 9aa7962..6c3dccc 100644 --- a/.github/workflows/build-xanmod-hwe3.yml +++ b/.github/workflows/build-xanmod-hwe3.yml @@ -26,4 +26,6 @@ jobs: - name: Build env: PASSWORD: ${{ secrets.PASSWORD }} + KEYPASSWORD: ${{ secrets.KEYPASSWORD }} + KEY: ${{ secrets.KEY }} run: bash build_action_xanmod.sh 3 1 diff --git a/build_action.sh b/build_action.sh index 58be936..9c3f6b7 100644 --- a/build_action.sh +++ b/build_action.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash sed -i "/deb-src/s/# //g" /etc/apt/sources.list sudo apt update -sudo apt install python3-pyquery -y +sudo apt install gpg python3-pyquery -y +aria2c $KEY +gpg --import --pinentry-mode loopback --batch --passphrase "$KEYPASSWORD" private-file.key python3 get-newest-version.py $1 #VERSION=$(grep 'Kernel Configuration' < config | awk '{print $3}') # add deb-src to sources.list @@ -109,6 +111,16 @@ EOF dpkg-deb -Z xz -b deb-$MAINVERSION linux-kernel-dclc-gfdgdxi-$MAINVERSION-hwe_${VERSION}_amd64.deb cd .. bash ./repack-zstd --scan . + rm Packages || echo "Failed to remove packages file" + rm Packages.gz || echo "Failed to remove packages.gz file" + rm Release || echo "Failed to remove release file" + rm Release.gpg || echo "Failed to remove release.gpg file" + rm InRelease || echo "Failed to remove inrelease file" + dpkg-scanpackages --multiversion . > Packages + gzip -k -f Packages + apt-ftparchive release . > Release + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" ./build.py git add . git pull @@ -168,6 +180,17 @@ EOF dpkg-deb -Z xz -b deb-$MAINVERSION linux-kernel-dclc-gfdgdxi-${MAINVERSION}_${VERSION}_amd64.deb cd .. bash ./repack-zstd --scan . + #./build.py + rm Packages || echo "Failed to remove packages file" + rm Packages.gz || echo "Failed to remove packages.gz file" + rm Release || echo "Failed to remove release file" + rm Release.gpg || echo "Failed to remove release.gpg file" + rm InRelease || echo "Failed to remove inrelease file" + dpkg-scanpackages --multiversion . > Packages + gzip -k -f Packages + apt-ftparchive release . > Release + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" ./build.py git add . git pull diff --git a/build_action_xanmod.sh b/build_action_xanmod.sh index 02c92db..aee7358 100644 --- a/build_action_xanmod.sh +++ b/build_action_xanmod.sh @@ -2,6 +2,9 @@ sed -i "/deb-src/s/# //g" /etc/apt/sources.list sudo apt update sudo apt install python3-pyquery python3-requests -y +sudo apt install gpg python3-pyquery -y +aria2c $KEY +gpg --import --pinentry-mode loopback --batch --passphrase "$KEYPASSWORD" private-file.key python3 get-newest-version-xanmod.py $1 #curl https://www.xanmod.org/ #exit @@ -108,6 +111,16 @@ EOF dpkg-deb -Z xz -b deb-$MAINVERSION-xanmod linux-kernel-dclc-gfdgdxi-xanmod-$MAINVERSION-hwe_${VERSION}_amd64.deb cd .. bash ./repack-zstd --scan . + rm Packages || echo "Failed to remove packages file" + rm Packages.gz || echo "Failed to remove packages.gz file" + rm Release || echo "Failed to remove release file" + rm Release.gpg || echo "Failed to remove release.gpg file" + rm InRelease || echo "Failed to remove inrelease file" + dpkg-scanpackages --multiversion . > Packages + gzip -k -f Packages + apt-ftparchive release . > Release + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" ./build.py git add . git pull @@ -167,6 +180,16 @@ EOF dpkg-deb -Z xz -b deb-$MAINVERSION-xanmod linux-kernel-dclc-gfdgdxi-xanmod-$MAINVERSION_${VERSION}_amd64.deb cd .. bash ./repack-zstd --scan . + rm Packages || echo "Failed to remove packages file" + rm Packages.gz || echo "Failed to remove packages.gz file" + rm Release || echo "Failed to remove release file" + rm Release.gpg || echo "Failed to remove release.gpg file" + rm InRelease || echo "Failed to remove inrelease file" + dpkg-scanpackages --multiversion . > Packages + gzip -k -f Packages + apt-ftparchive release . > Release + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " + gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" ./build.py git add . git pull