diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index f850be2..a763011 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Trigger Compile run: | - if [ '${{ matrix.device }}' = 'r1s' ] || [ '${{ matrix.device }}' = 'x86' ]; then + if [ '${{ matrix.device }}' = 'r1s' ]; then branch='18.06'; else branch='master'; diff --git a/common.seed b/common.seed index 696a743..5c55623 100644 --- a/common.seed +++ b/common.seed @@ -20,7 +20,7 @@ CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y CONFIG_PACKAGE_luci-app-autoreboot=y -CONFIG_PACKAGE_luci-app-cifs=y +CONFIG_PACKAGE_luci-app-cifs-mount=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-filetransfer=y diff --git a/scripts/patches.sh b/scripts/patches.sh index f91fec9..2ffddd3 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -20,7 +20,7 @@ sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ mkdir -p `find package/ -follow -type d -path '*/pdnsd-alt'`/patches mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches -sed -i 's/5.0/1.0/' .ccache/ccache.conf +sed -i 's/5.0/1.0/' .ccache/ccache.conf || true if [ $BRANCH == 'master' ]; then