diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index aab71197a..ffd90a244 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -6,13 +6,19 @@ on: device: description: 'Select device to build' required: true - default: 'nanopi-r5s' + default: 'x86_64' type: choice options: - 'armv8' - 'nanopi-r4s' - 'nanopi-r5s' + - 'netgear_r8500' - 'x86_64' + build_options: + description: 'Build options (separate multiple options with spaces)' + required: false + default: 'BUILD_FAST=y ENABLE_LTO=y ENABLE_LRNG=y ENABLE_BPF=y USE_GCC13=y USE_MOLD=y' + type: string jobs: build: @@ -61,7 +67,8 @@ jobs: continue-on-error: true run: | export GITHUB_REPO=${{ github.repository }} - BUILD_FAST=y ENABLE_LTO=y ENABLE_LRNG=y ENABLE_BPF=y USE_GCC13=y USE_MOLD=y bash <(curl -sS https://raw.githubusercontent.com/${{ github.repository }}/master/openwrt/build.sh) rc2 ${{ github.event.inputs.device }} + export ${{ github.event.inputs.build_options }} + bash <(curl -sS https://raw.githubusercontent.com/${{ github.repository }}/master/openwrt/build.sh) rc2 ${{ github.event.inputs.device }} cd openwrt tags=$(git describe --abbrev=0 --tags) echo "latest_release=$tags" >>$GITHUB_ENV diff --git a/openwrt/build.sh b/openwrt/build.sh index 389dd957a..83995bcac 100644 --- a/openwrt/build.sh +++ b/openwrt/build.sh @@ -450,7 +450,7 @@ if [ "$platform" = "x86_64" ]; then BUILD_TYPE=releases fi VERSION=$(sed 's/v//g' version.txt) - SHA256=$(sha256sum bin/targets/x86/64/*-generic-squashfs-combined-efi.img.gz | awk '{print $1}') + SHA256=$(sha256sum bin/targets/x86/64*/*-generic-squashfs-combined-efi.img.gz | awk '{print $1}') cat > ota/fw.json <