diff --git a/.github/workflows/main.yml b/.github/workflows/master.yml similarity index 55% rename from .github/workflows/main.yml rename to .github/workflows/master.yml index 01db0cd..d61885f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/master.yml @@ -5,9 +5,7 @@ name: NanoPi-R1S H5 FriendlyWrt(master+lean's feed) Build on: push: paths: - - '.github/workflows/main.yml' - schedule: - - cron: 0 8 * * 5 + - '.github/workflows/master.yml' # release: # types: [published] @@ -40,9 +38,8 @@ jobs: - name: Merge UpStearm OpenWrt run: | cd friendlywrt-h5 - cd .repo/manifests - rm -f ./h5.xml - wget https://raw.githubusercontent.com/klever1988/NanoPi-R1S/master/h5.xml + rm .repo/manifests/h5.xml + cp ../h5.xml .repo/manifests/h5.xml repo sync -c --no-clone-bundle - name: Merge LEDE @@ -64,49 +61,7 @@ jobs: run: | cd friendlywrt-h5 rm -f friendlywrt/.config* - sed -i '/docker/d;/DOCKER/d' ./configs/config_h5 - cat >> ./configs/config_h5 <