From 33f66fdae5c8e4915646809738ce999aac7f468c Mon Sep 17 00:00:00 2001 From: billz Date: Sat, 8 Feb 2025 10:52:26 -0800 Subject: [PATCH 1/2] Update naming to reflect clarity in arch, OS + purpose --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66c952ee..cbfa871e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: id: build uses: usimd/pi-gen-action@v1 with: - image-name: "raspap-${{ github.ref_name }}-${{ matrix.arch }}" + image-name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}" enable-ssh: 1 stage-list: stage0 stage1 stage2 ./stage-raspap verbose-output: true @@ -57,8 +57,8 @@ jobs: - name: Upload Artifact uses: svenstaro/upload-release-action@v2 with: - asset_name: raspap-image-${{ github.ref_name }}-${{ matrix.arch }}.zip + asset_name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}.img.zip" file: ${{ steps.build.outputs.image-path }} repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref }} + tag: ${{ github.event.inputs.tag || github.ref }} overwrite: true From c34cbeca8d03ff6b647e85086b9672ade494b6b5 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 9 Feb 2025 00:46:27 -0800 Subject: [PATCH 2/2] Exec raspi-config noint do_wifi_country --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbfa871e..ede5446e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,9 @@ jobs: #!/bin/bash apt-get update -y && apt-get install -y curl dhcpcd5 iptables procps curl -sL https://install.raspap.com | bash -s -- --yes --openvpn 1 --restapi 1 --adblock 1 --wireguard 1 --tcp-bbr 1 --check 0 + + # Set Wi-Fi country to prevent RF kill + raspi-config nonint do_wifi_country "US" EOF } && chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&