Skip to content

Commit 1497b1c

Browse files
authored
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]>
1 parent 44af590 commit 1497b1c

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
actions: read
8080
contents: write
8181
container:
82-
image: openwrt/rootfs:latest
82+
image: openwrt/rootfs:x86-64-23.05.3
8383

8484
steps:
8585
- name: Prepare OPKG

.github/workflows/release.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,11 @@ jobs:
2929
- name: Update version
3030
run: sed -i "s/<main>/${GITHUB_REF_NAME}/" privoxy-blocklist.sh
3131

32-
- name: Release
33-
uses: softprops/action-gh-release@v2
34-
if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'a') }}
35-
with:
36-
draft: true
37-
prerelease: true
38-
files: privoxy-blocklist.sh
39-
generate_release_notes: true
40-
4132
- name: Release
4233
uses: softprops/action-gh-release@v2
4334
if: ${{ startsWith(github.ref, 'refs/tags/') }}
4435
with:
45-
draft: ${{ contains(github.ref, 'a') }}
46-
prerelease: ${{ contains(github.ref, 'a') || contains(github.ref, 'rc') }}
36+
draft: True
37+
prerelease: ${{ contains(github.ref, '-a') || contains(github.ref, '-rc') }}
4738
files: privoxy-blocklist.sh
4839
generate_release_notes: true

tests/Dockerfile_openwrt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openwrt/rootfs
1+
FROM openwrt/rootfs:x86-64-23.05.3
22
# hadolint ignore=DL3018
33
RUN mkdir /var/lock /var/run
44
RUN opkg update \

tests/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ while getopts ":io:r" opt; do
1111
case "${opt}" in
1212
"i")
1313
interactive=1
14+
shift
1415
;;
1516
"o")
1617
os="${OPTARG}"

0 commit comments

Comments
 (0)