one more time

This commit is contained in:
Yury Sannikov
2024-02-21 02:15:42 +03:00
parent eefd030d04
commit 90adc8ea2c

View File

@@ -46,9 +46,9 @@ jobs:
cache-name: "cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}" cache-name: "cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}"
with: with:
path: . path: .
key: ${{ runner.os }}-build-vm-${{ env.cache-name }} key: ${{ runner.os }}-build-vm2-${{ env.cache-name }}
restore-keys: | restore-keys: |
${{ runner.os }}-build-vm-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}- ${{ runner.os }}-build-vm2-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-
- name: Building kernel and tools - name: Building kernel and tools
if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }} if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }}
@@ -68,7 +68,19 @@ jobs:
make defconfig make defconfig
make target/linux/compile V=s || true echo " > make tools/install"
make tools/install -i -j `nproc`
cat ./build_dir/target-*/linux-*/linux-*/.vermagic
echo " > make toolchain/install"
make toolchain/install -i -j `nproc`
cat ./build_dir/target-*/linux-*/linux-*/.vermagic
# compile kernel module
echo " > make target/linux/compile"
make target/linux/compile -i -j `nproc` V=s
VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic` VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }} VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
@@ -78,66 +90,55 @@ jobs:
exit 1 exit 1
fi fi
echo " > make tools/install" # - name: Update feeds
make tools/install -i -j `nproc` # run: |
echo " > make toolchain/install" # wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
make toolchain/install -i -j `nproc` # echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
# compile kernel module
echo " > make target/linux/compile"
make target/linux/compile -i -j `nproc` V=s
echo "Final Kernel vermagic:" # ./scripts/feeds update luci
cat ./build_dir/target-*/linux-*/linux-*/.vermagic # ./scripts/feeds install -a -p luci
# ./scripts/feeds update awgopenwrt
# ./scripts/feeds install -a -p awgopenwrt
- name: Update feeds # wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
run: | # echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf # echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf # echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
# echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
# echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
# echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
# echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
./scripts/feeds update luci # make defconfig
./scripts/feeds install -a -p luci
./scripts/feeds update awgopenwrt
./scripts/feeds install -a -p awgopenwrt
wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config # - name: Build amneziawg-tools
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config # run: |
echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config # make V=s package/amneziawg-tools/{clean,download,prepare}
echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config # make V=s package/amneziawg-tools/compile
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
make defconfig # - name: Build kmod-amneziawg
# run: |
# make package/kmod-amneziawg/{clean,download,prepare}
# make package/kmod-amneziawg/compile
- name: Build amneziawg-tools # - name: Build luci
run: | # run: |
make V=s package/amneziawg-tools/{clean,download,prepare} # make package/luci-app-amneziawg/{clean,download,prepare}
make V=s package/amneziawg-tools/compile # make package/luci-app-amneziawg/compile V=s
- name: Build kmod-amneziawg # - name: Prepare artifacts
run: | # run: |
make package/kmod-amneziawg/{clean,download,prepare} # tag_name=${{ github.ref_name }}
make package/kmod-amneziawg/compile # mkdir -p awgrelease
# postfix="${tag_name}_v${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
# cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
# cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
# cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
- name: Build luci # - name: Release
run: | # uses: softprops/action-gh-release@v1
make package/luci-app-amneziawg/{clean,download,prepare} # with:
make package/luci-app-amneziawg/compile V=s # files: awgrelease/*.ipk
- name: Prepare artifacts
run: |
tag_name=${{ github.ref_name }}
mkdir -p awgrelease
postfix="${tag_name}_v${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
- name: Release
uses: softprops/action-gh-release@v1
with:
files: awgrelease/*.ipk
- name: Cleanup - name: Cleanup
run: | run: |