Skip to content

Commit ec7b52c

Browse files
committed
fix workflow
1 parent a1c26d2 commit ec7b52c

File tree

1 file changed

+32
-18
lines changed

1 file changed

+32
-18
lines changed

.github/workflows/openwrt-release.yml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
permissions:
2+
contents: write
13
name: Build OpenWrt Package
24

35
on:
@@ -15,12 +17,12 @@ jobs:
1517
matrix:
1618
target:
1719
- x86_64
18-
# - aarch64_cortex-a53
19-
# - aarch64_generic
20-
# - arm_cortex-a7
21-
# - arm_cortex-a9
22-
# - mips_24kc
23-
# - mipsel_24kc
20+
- aarch64_cortex-a53
21+
- aarch64_generic
22+
- arm_cortex-a7
23+
- arm_cortex-a9
24+
- mips_24kc
25+
- mipsel_24kc
2426
sdk_version:
2527
- openwrt-24.10
2628
- snapshots
@@ -52,18 +54,18 @@ jobs:
5254
NO_SHFMT_CHECK: 1
5355
NO_REFRESH_CHECK: 1
5456

55-
- name: 🔍 Debug build output
56-
run: |
57-
echo "=== Build directory structure ==="
58-
find . -name "*.ipk" -type f 2>/dev/null || echo "No .ipk files found"
59-
echo "=== bin directory structure ==="
60-
ls -la bin/ 2>/dev/null || echo "No bin directory found"
61-
if [ -d "bin/packages" ]; then
62-
echo "=== packages directory structure ==="
63-
find bin/packages/ -type f -name "*.ipk" 2>/dev/null || echo "No .ipk files in packages directory"
64-
echo "=== Full packages directory tree ==="
65-
ls -laR bin/packages/ 2>/dev/null || echo "No packages directory"
66-
fi
57+
# - name: 🔍 Debug build output
58+
# run: |
59+
# echo "=== Build directory structure ==="
60+
# find . -name "*.ipk" -type f 2>/dev/null || echo "No .ipk files found"
61+
# echo "=== bin directory structure ==="
62+
# ls -la bin/ 2>/dev/null || echo "No bin directory found"
63+
# if [ -d "bin/packages" ]; then
64+
# echo "=== packages directory structure ==="
65+
# find bin/packages/ -type f -name "*.ipk" 2>/dev/null || echo "No .ipk files in packages directory"
66+
# echo "=== Full packages directory tree ==="
67+
# ls -laR bin/packages/ 2>/dev/null || echo "No packages directory"
68+
# fi
6769

6870
- name: 📦 Upload artifact for ${{ matrix.target }}
6971
uses: actions/upload-artifact@v4
@@ -100,6 +102,18 @@ jobs:
100102
with:
101103
path: ./release-assets
102104

105+
- name: 🏷️ Disambiguate APK filenames per matrix
106+
run: |
107+
set -euo pipefail
108+
# Rename each APK to include its artifact (matrix) folder name
109+
# Example: adblock-fast-1.1.4-r6.apk -> adblock-fast-1.1.4-r6__adblock-fast-x86_64-openwrt-24.10.apk
110+
while IFS= read -r -d '' f; do
111+
dir="$(basename "$(dirname "$f")")"
112+
base="$(basename "$f")"
113+
stem="${base%.apk}"
114+
mv -v "$f" "$(dirname "$f")/${stem}__${dir}.apk"
115+
done < <(find ./release-assets -type f -name '*.apk' -print0)
116+
103117
- name: 🗃️ Create GitHub Release
104118
uses: softprops/action-gh-release@v2
105119
with:

0 commit comments

Comments
 (0)