From 343a9492d1fde13fe0ee7c1fff269227cda1fa1e Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 3 Jul 2024 00:05:25 +0800 Subject: [PATCH 1/3] build.sh: fix x86 glibc creation of ota json Signed-off-by: sbwml --- openwrt/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openwrt/build.sh b/openwrt/build.sh index 795b5c499..30c623df6 100644 --- a/openwrt/build.sh +++ b/openwrt/build.sh @@ -444,7 +444,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 < Date: Wed, 3 Jul 2024 00:08:05 +0800 Subject: [PATCH 2/3] ci: add netgear_r8500 device Signed-off-by: sbwml --- .github/workflows/build-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index aab71197a..2f2d0548f 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -12,6 +12,7 @@ on: - 'armv8' - 'nanopi-r4s' - 'nanopi-r5s' + - 'netgear_r8500' - 'x86_64' jobs: From a361a67c4c7c0330e088bdbed855dbdfbfdd8154 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 3 Jul 2024 00:13:19 +0800 Subject: [PATCH 3/3] ci: add build options support Signed-off-by: sbwml --- .github/workflows/build-release.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2f2d0548f..ffd90a244 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -6,7 +6,7 @@ on: device: description: 'Select device to build' required: true - default: 'nanopi-r5s' + default: 'x86_64' type: choice options: - 'armv8' @@ -14,6 +14,11 @@ on: - '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: @@ -62,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