test vermagic

yury-sannikov · Feb 20, 2024 · 57c051b · 57c051b
1 parent 66a19eb
commit 57c051b
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml
@@ -82,46 +82,36 @@ jobs:
           echo "Kernel vermagic:"
           cat ./build_dir/target-*/linux-*/linux-*/.vermagic
 
-
-      - name: Fix vermagic of cached kernel & tools
-        run: |
-          echo "Kernel vermagic BEFORE:"
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic
-          wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
-
-          echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
-          echo "CONFIG_PACKAGE_amneziawg-tools=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
-
-          make target/linux/compile || true
-
-          echo "Kernel vermagic AFTER:"
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic
-
       - 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
+          rm -rf ./build_dir
 
           cp feeds.conf.default feeds.conf
           echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
 
+          ./scripts/feeds update -a
+          ./scripts/feeds install -a
           ./scripts/feeds update luci
           ./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
           echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
           echo "CONFIG_PACKAGE_amneziawg-tools=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
+          make target/linux/compile V=s || true
+          echo "Kernel vermagic AFTER:"
+          cat ./build_dir/target-*/linux-*/linux-*/.vermagic
+
 
       - name: Build amneziawg-tools
         run: |