From 1497b1c801172608c2a02afd6e3c710cf1fce57f Mon Sep 17 00:00:00 2001
From: Andrwe Lord Weber <github@andrwe.org>
Date: Sun, 7 Apr 2024 18:40:20 +0200
Subject: [PATCH] remove duplicated release job (#60)

* remove duplicated release job
* switch to openwrt-23.05 as latest has no gcc
* fix github workflow for openwrt

---------

Signed-off-by: Andrwe@Gitlab <alw+gitlab@andrwe.org>
---
 .github/workflows/pytest.yml  |  2 +-
 .github/workflows/release.yml | 13 ++-----------
 tests/Dockerfile_openwrt      |  2 +-
 tests/run.sh                  |  1 +
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 1439822..01ccbac 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -79,7 +79,7 @@ jobs:
       actions: read
       contents: write
     container:
-      image: openwrt/rootfs:latest
+      image: openwrt/rootfs:x86-64-23.05.3
 
     steps:
       - name: Prepare OPKG
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7388054..1d5a96b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,20 +29,11 @@ jobs:
       - name: Update version
         run: sed -i "s/<main>/${GITHUB_REF_NAME}/" privoxy-blocklist.sh
 
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'a') }}
-        with:
-          draft: true
-          prerelease: true
-          files: privoxy-blocklist.sh
-          generate_release_notes: true
-
       - name: Release
         uses: softprops/action-gh-release@v2
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         with:
-          draft: ${{ contains(github.ref, 'a') }}
-          prerelease: ${{ contains(github.ref, 'a') || contains(github.ref, 'rc') }}
+          draft: True
+          prerelease: ${{ contains(github.ref, '-a') || contains(github.ref, '-rc') }}
           files: privoxy-blocklist.sh
           generate_release_notes: true
diff --git a/tests/Dockerfile_openwrt b/tests/Dockerfile_openwrt
index c7484bc..382e5f4 100644
--- a/tests/Dockerfile_openwrt
+++ b/tests/Dockerfile_openwrt
@@ -1,4 +1,4 @@
-FROM		openwrt/rootfs
+FROM		openwrt/rootfs:x86-64-23.05.3
 # hadolint ignore=DL3018
 RUN		mkdir /var/lock /var/run
 RUN		opkg update \
diff --git a/tests/run.sh b/tests/run.sh
index 24eaf42..f7f0c3c 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -11,6 +11,7 @@ while getopts ":io:r" opt; do
     case "${opt}" in
         "i")
             interactive=1
+            shift
             ;;
         "o")
             os="${OPTARG}"