.github/workflows/release.yml

@@ -4,7 +4,6 @@ permissions:
   contents: write
 
 on:
-  workflow_dispatch:
   release:
     types: [published]
 
@@ -29,25 +28,8 @@ jobs:
           {
           cat > stage-raspap/package-raspap/00-run-chroot.sh <<-EOF
           #!/bin/bash
-          apt-get update -y && apt-get install -y curl dhcpcd5 procps
+          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"
-
-          # Fetch RaspAP version and set MOTD
-          RASPAP_VERSION=\$(curl -sL https://install.raspap.com | bash -s -- --version)
-          echo "\$RASPAP_VERSION" | tee /etc/motd
-          EOF
-          } &&
-          chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&
-          {
-          cat > stage-raspap/prerun.sh <<-EOF
-          #!/bin/bash -e
-          if [ ! -d "\${ROOTFS_DIR}" ]; then
-            copy_previous
-          fi
           EOF
           } &&
           chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&
@@ -65,18 +47,18 @@ jobs:
         id: build
         uses: usimd/pi-gen-action@v1
         with:
-          image-name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}"
+          image-name: "raspap-${{ github.ref_name }}-${{ matrix.arch }}"
           enable-ssh: 1
           stage-list: stage0 stage1 stage2 ./stage-raspap
           verbose-output: true
           pi-gen-version: ${{ matrix.pi_gen_version }}
-          pi-gen-repository: billz/pi-gen
+          pi-gen-repository: RaspAP/pi-gen
 
       - name: Upload Artifact
         uses: svenstaro/upload-release-action@v2
         with:
-          asset_name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}.img.zip"
+          asset_name: raspap-image-${{ github.ref_name }}-${{ matrix.arch }}.zip
           file: ${{ steps.build.outputs.image-path }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.event.inputs.tag || github.ref }}
+          tag: ${{ github.ref }}
           overwrite: true