Skip to content

Commit

Permalink
workflow: fix error sdk address
Browse files Browse the repository at this point in the history
  • Loading branch information
vernesong committed Mar 6, 2024
1 parent b83d698 commit d8bcf91
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clear_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# https://github.com/marketplace/actions/git-changesets
- id: changed_files
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/compile_dev_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sudo apt-get -y install git
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand All @@ -32,7 +32,7 @@ jobs:
echo "current_id: $(sed -n 1p ./dev/core_version)"
- name: Clone Clash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: Dreamacro/clash
ref: dev
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand All @@ -82,7 +82,7 @@ jobs:
check-latest: true

- name: Clone Clash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: Dreamacro/clash
ref: dev
Expand All @@ -98,7 +98,7 @@ jobs:
cp -rf "./bin/." "../tmp/bin/"
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/compile_meta_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sudo apt-get -y install git
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand All @@ -32,7 +32,7 @@ jobs:
echo "current_id: $(sed -n 3p ./dev/core_version)"
- name: Clone Clash Meta Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: MetaCubeX/mihomo
ref: Alpha
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand All @@ -81,7 +81,7 @@ jobs:
check-latest: true

- name: Clone Clash Meta Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: MetaCubeX/mihomo
ref: Alpha
Expand All @@ -96,7 +96,7 @@ jobs:
cp -rf "./bin/." "../tmp/bin/"
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/compile_new_ipk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
current_version: ${{ steps.current_version.outputs.version }}
steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}

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

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

Expand All @@ -59,10 +59,10 @@ jobs:
run: |
cd ..
mkdir tmp
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"
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"
cd \tmp
tar xjf SDK.tar.bz2
mv "OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64" "SDK"
mv "OpenWrt-SDK-15.05.1-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64" "SDK"
- name: Copy OpenClash Source Codes
run: |
Expand All @@ -85,7 +85,7 @@ jobs:
make package/luci-app-openclash/compile V=99
- name: Switch OpenClash Repository to Package
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: package

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compile_premium_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sudo apt-get -y install curl git gzip
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
echo "upx=../upx-3.95-amd64_linux/upx" >> $GITHUB_ENV
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master_release_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
sudo apt-get -y install git
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: core

Expand All @@ -39,7 +39,7 @@ jobs:
fi
- name: Clone OpenClash Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: package

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,13 @@
---


从 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) 编译
从 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) 编译
```bash
# 解压下载好的 SDK
tar xjf OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2
cd OpenWrt-SDK-ar71xx-*
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"
cd \tmp
tar xjf SDK.tar.bz2
cd OpenWrt-SDK-15.05.1-*

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

# IPK文件位置
./bin/ar71xx/packages/base/luci-app-openclash_0.39.7-beta_all.ipk
./bin/ar71xx/packages/base/luci-app-openclash_*-beta_all.ipk
```

```bash
Expand Down

0 comments on commit d8bcf91

Please sign in to comment.