pull/983/head
John Doe 2021-10-21 11:41:53 +08:00
parent be5e103569
commit 9eeddc4990
No known key found for this signature in database
GPG Key ID: 30F190E0C359CB4F
3 changed files with 3 additions and 3 deletions

View File

@ -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';

View File

@ -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

View File

@ -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