vermagic3

yury-sannikov · Feb 21, 2024 · 1e35c78 · 1e35c78
1 parent 0c1915d
commit 1e35c78
Showing 1 changed file with 72 additions and 61 deletions.
diff --git a/.github/workflows/build-module.yml b/.github/workflows/build-module.yml
@@ -46,18 +46,22 @@ jobs:
           cache-name: "cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}"
         with:
           path: .
-          key: ${{ runner.os }}-build-vm2-${{ env.cache-name }}
+          key: ${{ runner.os }}-build-vm3-${{ env.cache-name }}
           restore-keys: |
-            ${{ runner.os }}-build-vm2-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-
+            ${{ runner.os }}-build-vm3-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-
 
       - name: Building kernel and tools
         if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }}
         run: |
           echo "pkgarch: ${{ matrix.build_env.pkgarch}}, target:${{ matrix.build_env.target}}, subtarget: ${{ matrix.build_env.subtarget}}"
 
           wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
-          ./scripts/feeds update
-          ./scripts/feeds install -a
+          echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
+          ./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
@@ -68,6 +72,17 @@ jobs:
 
           make defconfig
 
+          make target/linux/compile V=s || true
+
+          VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
+          VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
+
+          if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
+            echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
+            exit 1
+          fi
+
+
           echo "    > make tools/install"
           make tools/install -i -j `nproc`
 
@@ -90,61 +105,57 @@ jobs:
             exit 1
           fi
 
-      - name: Update feeds
-        run: |
-          echo "Vermagic:"
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic
-
-          wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
-          echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
-
-          ./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-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: Update feeds
+      #   run: |
+      #     echo "Vermagic:"
+      #     cat ./build_dir/target-*/linux-*/linux-*/.vermagic
+
+      #     wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
+      #     echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
+
+      #     ./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-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 amneziawg-tools
+      #   run: |
+      #     cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
+      #     make V=s package/amneziawg-tools/{clean,download,prepare}
+      #     make V=s package/amneziawg-tools/compile
+
+      # - name: Build kmod-amneziawg
+      #   run: |
+      #     make package/kmod-amneziawg/{clean,download,prepare}
+      #     make package/kmod-amneziawg/compile
+
+      # - name: Build luci
+      #   run: |
+      #     make package/luci-app-amneziawg/{clean,download,prepare}
+      #     make package/luci-app-amneziawg/compile V=s
+
+      # - 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: Build amneziawg-tools
-        run: |
-          cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
-          make V=s package/amneziawg-tools/{clean,download,prepare}
-          make V=s package/amneziawg-tools/compile
-
-      - name: Build kmod-amneziawg
-        run: |
-          make package/kmod-amneziawg/{clean,download,prepare}
-          make package/kmod-amneziawg/compile
-
-      - name: Build luci
-        run: |
-          make package/luci-app-amneziawg/{clean,download,prepare}
-          make package/luci-app-amneziawg/compile V=s
-
-      - 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
-        run: |
-          rm feeds.conf || true
-          rm -rf awgrelease || true