v0.0.6

lolo6oT · Jan 23, 2024 · ebf53af · ebf53af
1 parent 35b36c8
commit ebf53af
Showing 1 changed file with 10 additions and 45 deletions.
diff --git a/.github/workflows/openwrt-awg.yml b/.github/workflows/openwrt-awg.yml
@@ -3,7 +3,7 @@ name: Create Release
 on:
   push:
     tags:
-      - "v0.0.5"
+      - "v0.0.6"
 
 jobs:
   build:
@@ -36,7 +36,7 @@ jobs:
             ${{ runner.os }}-build-cache-tools-kernel-${{ matrix.tag }}-
             ${{ runner.os }}-build-
 
-      - name: Building kernel and tools
+      - name: Building kernel, tools, update feeds, amnezia packages
         if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }}
         run: |
           pkgarch=${{ matrix.build_env.pkgarch}}
@@ -45,20 +45,7 @@ jobs:
 
           echo "pkgarch: ${pkgarch}, target: ${target}, subtarget: ${subtarget}"
 
-          #echo "CONFIG_TARGET_${target}=y" > .config
-          #echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-          #echo "CONFIG_DEFAULT_TARGET_${target}_${subtarget}=y" >> .config
-          #echo "CONFIG_ALL_KMODS=y" >> .config
-
           wget https://downloads.openwrt.org/releases/23.05.2/targets/mediatek/filogic/config.buildinfo -O .config
-          #echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
-          #echo "CONFIG_PACKAGE_amnezia-wg-tools=y" >> .config
-          #echo "CONFIG_PACKAGE_amneziawg-go=y" >> .config
-          #echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .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
 
@@ -70,54 +57,32 @@ jobs:
           echo "    > make target/linux/compile"
           make target/linux/compile  -i -j `nproc` V=s
 
-      - name: Update feeds
-        run: |
-          # clean if cache restored from different cache key
           rm -rf bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/ || true
           rm -rf bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/  || true
 
           cp feeds.conf.default feeds.conf
           echo "src-git awgopenwrt https://github.com/lolo6oT/awg-openwrt.git" >> ./feeds.conf
 
           ./scripts/feeds update -a
-          ./scripts/feeds install -a
-          #./scripts/feeds update awgopenwrt
-          #./scripts/feeds install -a -p awgopenwrt
-          
-          wget https://downloads.openwrt.org/releases/23.05.2/targets/mediatek/filogic/config.buildinfo -O .config
-          
-          echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
+          ./scripts/feeds install -a          
+
+          echo "CONFIG_PACKAGE_kmod-amneziawg=y" >> .config
           echo "CONFIG_PACKAGE_amnezia-wg-tools=y" >> .config
           echo "CONFIG_PACKAGE_amneziawg-go=y" >> .config
           echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
           make defconfig
 
-      - name: Build amnezia-wg-tools
-        run: |
-          make -j `nproc` package/amnezia-wg-tools/{clean,download,prepare}
-          make -j `nproc` package/amnezia-wg-tools/compile
-
-      - name: Build amneziawg-go
-        run: |
-          make -j `nproc` package/amneziawg-go/{clean,download,prepare}
-          make -j `nproc` package/amneziawg-go/compile
-
-      - name: Build kmod-amneziawg
-        run: |
-          make -j `nproc` package/kmod-amneziawg/{clean,download,prepare}
-          make -j `nproc` package/kmod-amneziawg/compile
-
-      - name: Build luci
-        run: |
-          make -j `nproc` package/luci-app-amneziawg/{clean,download,prepare}
-          make -j `nproc` package/luci-app-amneziawg/compile
+          make -j `nproc` package/amnezia-wg-tools/{clean,download,prepare,compile}
+          make -j `nproc` package/amneziawg-go/{clean,download,prepare,compile}
+          make -j `nproc` package/kmod-amneziawg/{clean,download,prepare,compile}
+          make -j `nproc` package/luci-app-amneziawg/{clean,download,prepare,compile}
 
       - name: Prepare artifacts
         run: |
           tag_name=${{  github.ref_name }}
           mkdir -p awgrelease
           postfix="${tag_name}_${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
-          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amnezia-wg-tools_*.ipk awgrelease/amnezia-wg-tools_${postfix}.ipk
+          cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
           cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-go_*.ipk awgrelease/amneziawg-go_${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