diff --git a/.github/workflows/friendlywrt.yml b/.github/workflows/friendlywrt.yml
index 6b41efd6f162aa8620f850d75ad8484c6adc7d94..15cbfae8207e00f93c81e1fe5007377883e0d868 100644
--- a/.github/workflows/friendlywrt.yml
+++ b/.github/workflows/friendlywrt.yml
@@ -83,12 +83,14 @@ jobs:
./changelog.sh FriendlyWRT
- name: Update Feeds
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328/friendlywrt
./scripts/feeds update -a
./scripts/feeds install -a
- name: Install Mods
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328
sed -i '/Load Average/i\\t\t
<%:CPU Temperature%> | <%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%> ℃ |
' friendlywrt/feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -99,6 +101,7 @@ jobs:
cp ../scripts/fw_update.sh friendlywrt/package/base-files/files/usr/bin/fw_update
- name: Add Temperature to Netdata
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328
mkdir -p friendlywrt/package/base-files/files/usr/lib/netdata/charts.d
@@ -123,11 +126,13 @@ jobs:
wget -O Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
- name: Install UPX
+ if: steps.changelog.outputs.changelog != ''
run: |
mkdir -p friendlywrt-rk3328/friendlywrt/staging_dir/host/bin/
ln -s /usr/bin/upx-ucl friendlywrt-rk3328/friendlywrt/staging_dir/host/bin/upx
- name: Update Target.mk
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328/friendlywrt/include
sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk
diff --git a/.github/workflows/friendlywrt_with_features.yml b/.github/workflows/friendlywrt_with_features.yml
index d9604fc06ae845a9ce3cd77df2fa401f780c0507..9c740ec0b03bbf9a626dba0dcf67107692728f80 100644
--- a/.github/workflows/friendlywrt_with_features.yml
+++ b/.github/workflows/friendlywrt_with_features.yml
@@ -59,6 +59,13 @@ jobs:
run: |
. add_packages_to_lean.sh
+ - name: Add SSRP
+ run: |
+ cd friendlywrt-rk3328/friendlywrt/package
+ git clone https://github.com/fw876/helloworld.git
+ cd helloworld
+ ../../../../set_repo_hash.sh SSRP
+
- name: Install Openwrt Libs
run: |
git config --global user.email "action@github.com" && git config --global user.name "GitHub Action"
@@ -83,12 +90,14 @@ jobs:
./changelog.sh FwF
- name: Update Feeds
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328/friendlywrt
./scripts/feeds update -a
./scripts/feeds install -a
- name: Install Mods
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328
sed -i '/Load Average/i\\t\t<%:CPU Temperature%> | <%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%> ℃ |
' friendlywrt/feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -99,6 +108,7 @@ jobs:
cp ../scripts/fw_update.sh friendlywrt/package/base-files/files/usr/bin/fw_update
- name: Add Temperature to Netdata
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328
mkdir -p friendlywrt/package/base-files/files/usr/lib/netdata/charts.d
@@ -129,11 +139,13 @@ jobs:
wget -O Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
- name: Install UPX
+ if: steps.changelog.outputs.changelog != ''
run: |
mkdir -p friendlywrt-rk3328/friendlywrt/staging_dir/host/bin/
ln -s /usr/bin/upx-ucl friendlywrt-rk3328/friendlywrt/staging_dir/host/bin/upx
- name: Update Target.mk
+ if: steps.changelog.outputs.changelog != ''
run: |
cd friendlywrt-rk3328/friendlywrt/include
sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk
diff --git a/add_packages_to_lean.sh b/add_packages_to_lean.sh
index 7f793cf4477fb87b212c3e8b54a8d8d0fe620e35..09bd5fa88482b98b221d18095b298b62470541e2 100755
--- a/add_packages_to_lean.sh
+++ b/add_packages_to_lean.sh
@@ -16,8 +16,9 @@ cd ..
pwd
git clone https://github.com/tty228/luci-app-serverchan.git
-../../../set_repo_hash.sh ServerChan
-cd ..
+cd luci-app-serverchan
+../../../../set_repo_hash.sh ServerChan
+cd ../..
pwd
echo "src-git scw https://github.com/songchenwen/openwrt-package" >> feeds.conf.default