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 <[email protected]>
Andrwe · Apr 7, 2024 · 1497b1c · 1497b1c
1 parent 44af590
commit 1497b1c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -11,6 +11,7 @@ while getopts ":io:r" opt; do
     case "${opt}" in
         "i")
             interactive=1
+            shift
             ;;
         "o")
             os="${OPTARG}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ while getopts ":io:r" opt; do @@
         case "${opt}" in
             "i")
                 interactive=1
+                shift
                 ;;
             "o")
                 os="${OPTARG}"
@@ Expand Down @@