Skip to content

Commit d8bcf91

Browse files
committed
workflow: fix error sdk address
1 parent b83d698 commit d8bcf91

7 files changed

+27
-25
lines changed

.github/workflows/clear_cache.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
# https://github.com/marketplace/actions/git-changesets
2424
- id: changed_files

.github/workflows/compile_dev_core.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
sudo apt-get -y install git
2222
2323
- name: Clone OpenClash Repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
ref: core
2727

@@ -32,7 +32,7 @@ jobs:
3232
echo "current_id: $(sed -n 1p ./dev/core_version)"
3333
3434
- name: Clone Clash Repository
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
repository: Dreamacro/clash
3838
ref: dev
@@ -64,7 +64,7 @@ jobs:
6464
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
6565
6666
- name: Clone OpenClash Repository
67-
uses: actions/checkout@v3
67+
uses: actions/checkout@v4
6868
with:
6969
ref: core
7070

@@ -82,7 +82,7 @@ jobs:
8282
check-latest: true
8383

8484
- name: Clone Clash Repository
85-
uses: actions/checkout@v3
85+
uses: actions/checkout@v4
8686
with:
8787
repository: Dreamacro/clash
8888
ref: dev
@@ -98,7 +98,7 @@ jobs:
9898
cp -rf "./bin/." "../tmp/bin/"
9999
100100
- name: Clone OpenClash Repository
101-
uses: actions/checkout@v3
101+
uses: actions/checkout@v4
102102
with:
103103
ref: core
104104

.github/workflows/compile_meta_core.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
sudo apt-get -y install git
2222
2323
- name: Clone OpenClash Repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
ref: core
2727

@@ -32,7 +32,7 @@ jobs:
3232
echo "current_id: $(sed -n 3p ./dev/core_version)"
3333
3434
- name: Clone Clash Meta Repository
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
repository: MetaCubeX/mihomo
3838
ref: Alpha
@@ -63,7 +63,7 @@ jobs:
6363
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
6464
6565
- name: Clone OpenClash Repository
66-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6767
with:
6868
ref: core
6969

@@ -81,7 +81,7 @@ jobs:
8181
check-latest: true
8282

8383
- name: Clone Clash Meta Repository
84-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
8585
with:
8686
repository: MetaCubeX/mihomo
8787
ref: Alpha
@@ -96,7 +96,7 @@ jobs:
9696
cp -rf "./bin/." "../tmp/bin/"
9797
9898
- name: Clone OpenClash Repository
99-
uses: actions/checkout@v3
99+
uses: actions/checkout@v4
100100
with:
101101
ref: core
102102

.github/workflows/compile_new_ipk.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
current_version: ${{ steps.current_version.outputs.version }}
1818
steps:
1919
- name: Clone Repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
ref: ${{ github.ref_name }}
2323

@@ -28,7 +28,7 @@ jobs:
2828
echo "New Version: $(grep 'PKG_VERSION:=' ./luci-app-openclash/Makefile |awk -F '=' '{print $2}')"
2929
3030
- name: Clone Repository
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
ref: package
3434

@@ -44,7 +44,7 @@ jobs:
4444
if: ${{ needs.Get-Version.outputs.version != needs.Get-Version.outputs.current_version }}
4545
steps:
4646
- name: Clone OpenClash dev Repository
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
with:
4949
ref: ${{ github.ref_name }}
5050

@@ -59,10 +59,10 @@ jobs:
5959
run: |
6060
cd ..
6161
mkdir tmp
62-
curl -SLk --connect-timeout 30 --retry 2 "https://archive.openwrt.org/snapshots/trunk/ar71xx/generic/OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2" -o "./tmp/SDK.tar.bz2"
62+
curl -SLk --connect-timeout 30 --retry 2 "https://archive.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/OpenWrt-SDK-15.05.1-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64.tar.bz2" -o "./tmp/SDK.tar.bz2"
6363
cd \tmp
6464
tar xjf SDK.tar.bz2
65-
mv "OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64" "SDK"
65+
mv "OpenWrt-SDK-15.05.1-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64" "SDK"
6666
6767
- name: Copy OpenClash Source Codes
6868
run: |
@@ -85,7 +85,7 @@ jobs:
8585
make package/luci-app-openclash/compile V=99
8686
8787
- name: Switch OpenClash Repository to Package
88-
uses: actions/checkout@v3
88+
uses: actions/checkout@v4
8989
with:
9090
ref: package
9191

.github/workflows/compile_premium_core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
sudo apt-get -y install curl git gzip
2222
2323
- name: Clone OpenClash Repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
ref: core
2727

@@ -63,7 +63,7 @@ jobs:
6363
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
6464
6565
- name: Clone OpenClash Repository
66-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6767
with:
6868
ref: core
6969

.github/workflows/master_release_sync.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
sudo apt-get -y install git
1818
1919
- name: Clone OpenClash Repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
ref: core
2323

@@ -39,7 +39,7 @@ jobs:
3939
fi
4040
4141
- name: Clone OpenClash Repository
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
ref: package
4545

README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@
6868
---
6969

7070

71-
从 OpenWrt 的 [SDK](https://archive.openwrt.org/snapshots/trunk/ar71xx/generic/OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2) 编译
71+
从 OpenWrt 的 [SDK](https://archive.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/OpenWrt-SDK-15.05.1-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64.tar.bz2) 编译
7272
```bash
7373
# 解压下载好的 SDK
74-
tar xjf OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2
75-
cd OpenWrt-SDK-ar71xx-*
74+
curl -SLk --connect-timeout 30 --retry 2 "https://archive.openwrt.org/chaos_calmer/15.05.1/ar71xx/generic/OpenWrt-SDK-15.05.1-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64.tar.bz2" -o "/tmp/SDK.tar.bz2"
75+
cd \tmp
76+
tar xjf SDK.tar.bz2
77+
cd OpenWrt-SDK-15.05.1-*
7678

7779
# Clone 项目
7880
mkdir package/luci-app-openclash
@@ -96,7 +98,7 @@ cd ../..
9698
make package/luci-app-openclash/luci-app-openclash/compile V=99
9799

98100
# IPK文件位置
99-
./bin/ar71xx/packages/base/luci-app-openclash_0.39.7-beta_all.ipk
101+
./bin/ar71xx/packages/base/luci-app-openclash_*-beta_all.ipk
100102
```
101103

102104
```bash

0 commit comments

Comments
 (0)