From 6f7575b24800a39cc7873ec94f5cd7c1dca25fb5 Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 29 Mar 2023 02:36:08 +0800 Subject: [PATCH] rm dev --- .github/workflows/cdn.yml | 20 ++++++++++---------- .github/workflows/custom.yml | 30 +++++++++--------------------- .github/workflows/exts.yml | 24 +----------------------- docs/Issues.html | 2 +- syno-extractor.sh | 4 ++-- 5 files changed, 23 insertions(+), 57 deletions(-) diff --git a/.github/workflows/cdn.yml b/.github/workflows/cdn.yml index 2940a89..4942016 100644 --- a/.github/workflows/cdn.yml +++ b/.github/workflows/cdn.yml @@ -24,15 +24,15 @@ jobs: git config --global user.name "github-actions[bot]" sudo timedatectl set-timezone "Asia/Shanghai" - curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild@main/parameter.json" - curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild@main/loads.json" - curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild@main/exts.json" - curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild@main/lkms.json" - curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild@main/tips.md" + curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild_old@main/parameter.json" + curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild_old@main/loads.json" + curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild_old@main/exts.json" + curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild_old@main/lkms.json" + curl -L "https://purge.jsdelivr.net/gh/wjz304/Redpill_CustomBuild_old@main/tips.md" - curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild/main/parameter.json" - curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild/main/loads.json" - curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild/main/exts.json" - curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild/main/lkms.json" - curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild/main/tips.md" + curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild_old/main/parameter.json" + curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild_old/main/loads.json" + curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild_old/main/exts.json" + curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild_old/main/lkms.json" + curl -I "https://cdn.statically.io/gh/wjz304/Redpill_CustomBuild_old/main/tips.md" diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index 1dde79e..8e959c7 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -248,7 +248,7 @@ jobs: if iscustom == 'true': lkms = [] with open('lkms.json', mode="r") as f: - keys = json.loads(f.read())['wjz304'][platform.replace('+', 'p').lower() + '_' + version.split('-')[-1]].keys() + keys = json.loads(f.read())['pocopico'][platform.replace('+', 'p').lower() + '_' + version.split('-')[-1]].keys() lkms = [x for x in keys if not x.endswith('*') and not x.endswith('#')] if lkm == '': lkm = lkms[0] @@ -442,8 +442,6 @@ jobs: with open('exts.json', mode="r") as f: extsjson = json.loads(f.read()) extskey = 'pocopico' - if dev == '1': - extskey = 'wjz304' if extskey in extsjson and rpKey in extsjson[extskey]: rpExts = list(extsjson[extskey][rpKey].keys()) extdels = [x.strip() for x in re.split(',| |\|', ext) if x.strip() != '' and x.strip().startswith('-')] @@ -763,7 +761,7 @@ jobs: # mkdir pat # sudo LD_LIBRARY_PATH=synoesp/extract synoesp/extract/syno_extract_system_patch ds.pat pat || echo "extract latest pat" - # curl -k https://raw.githubusercontent.com/wjz304/Redpill_CustomBuild/main/syno-extractor.sh | sudo bash -s ds.pat pat + # curl -k https://raw.githubusercontent.com/wjz304/Redpill_CustomBuild_old/main/syno-extractor.sh | sudo bash -s ds.pat pat chmod a+x $GITHUB_WORKSPACE/syno-extractor.sh && $GITHUB_WORKSPACE/syno-extractor.sh ds.pat pat tar -czvf ${synoplatform}_${synoversion}.pat -C ./pat/ . --warning=no-file-changed @@ -856,15 +854,10 @@ jobs: bArgs="BRP_DEBUG=1 ${bArgs}" fi - lkmext=https://raw.githubusercontent.com/wjz304/rp-ext/master + lkmext=https://raw.githubusercontent.com/pocopico/rp-ext/master rpext=https://raw.githubusercontent.com/pocopico/rp-ext/master loadext=https://raw.githubusercontent.com/${repo}/redpill-load/${branch} - if [ ${{ env.dev }} == '1' ]; then - rpext=https://raw.githubusercontent.com/wjz304/rp-ext/master - if [ ${repo} == 'pocopico' ]; then - loadext=https://raw.githubusercontent.com/wjz304/rp-ext/master - fi - fi + git clone -b ${branch} https://github.com/${repo}/redpill-load redpill-load @@ -875,7 +868,7 @@ jobs: find redpill-load/ext -type f -name '*.sh' -exec ls -al '{}' + #容错 - # curl -k https://raw.githubusercontent.com/wjz304/Redpill_CustomBuild/main/typo.sh | bash + # curl -k https://raw.githubusercontent.com/wjz304/Redpill_CustomBuild_old/main/typo.sh | bash chmod a+x $GITHUB_WORKSPACE/typo.sh && . $GITHUB_WORKSPACE/typo.sh cp user_config.json redpill-load/user_config.json @@ -895,7 +888,7 @@ jobs: # 添加必备驱动 echo "===========================添加必备驱动==========================" - echo -e '{\n "thethorgroup.boot-wait": "https://raw.githubusercontent.com/wjz304/rp-ext/master/redpill-boot-wait/rpext-index.json"\n}' > bundled-exts.json + echo -e '{\n "thethorgroup.boot-wait": "https://raw.githubusercontent.com/pocopico/rp-ext/master/redpill-boot-wait/rpext-index.json"\n}' > bundled-exts.json [ -f ./redpill-boot-wait/rpext-index.json -a "$(curl -s --location ${loadext}/redpill-boot-wait/rpext-index.json | jq -r .releases.${synoplatform}_${synoversion})" != "null" ] && ./ext-manager.sh add ${loadext}/redpill-boot-wait/rpext-index.json [ -f ./redpill-acpid/rpext-index.json -a "$(curl -s --location ${loadext}/redpill-acpid/rpext-index.json | jq -r .releases.${synoplatform}_${synoversion})" != "null" ] && ./ext-manager.sh add ${loadext}/redpill-acpid/rpext-index.json @@ -929,14 +922,9 @@ jobs: do if [ "${item}" == "${platform}" ]; then if [ -z "${{ env.dtb }}" ]; then - echo "========================Add redpill-dtb=========================" - ./ext-manager.sh add ${lkmext}/redpill-dtb/rpext-index.json - ./ext-manager.sh _update_platform_exts ${synoplatform}_${synoversion} pocopico.dtb - # 仅本地可用 - # elif [ "${{ env.dtb }}" == "auto" ]; then - # echo "==========================Add dtbpatch==========================" - # ./ext-manager.sh add ${lkmext}/dtbpatch/rpext-index.json - # ./ext-manager.sh _update_platform_exts ${synoplatform}_${synoversion} dtbpatch + echo "==========================Add dtbpatch==========================" + ./ext-manager.sh add ${lkmext}/dtbpatch/rpext-index.json + ./ext-manager.sh _update_platform_exts ${synoplatform}_${synoversion} dtbpatch else echo "=====================Add redpill-dtb-static=====================" ./ext-manager.sh add ${lkmext}/redpill-dtb-static/rpext-index.json diff --git a/.github/workflows/exts.yml b/.github/workflows/exts.yml index 915abd6..7ff3e08 100644 --- a/.github/workflows/exts.yml +++ b/.github/workflows/exts.yml @@ -43,21 +43,6 @@ jobs: svn co https://github.com/jim3ma/synology-igc/trunk/igc rp-ext_pocopico/igc - sudo rm -rf rp-ext_wjz304 - git clone https://github.com/wjz304/rp-ext rp-ext_wjz304 - # 容错 - rm -f rp-ext_wjz304/asix/releases/ds3617xs_42218.json - rm -f rp-ext_wjz304/ax88179_178a/releases/ds3617xs_42218.json - rm -f rp-ext_wjz304/dm9601/releases/ds3617xs_42218.json - rm -f rp-ext_wjz304/nct6775/releases/dva3221_42218.json - rm -f rp-ext_wjz304/sfc/releases/ds918p_25556.json - rm -f rp-ext_wjz304/v9fs/releases/ds918p_42218.json - - #igc 临时对策 - rm -rf rp-ext_wjz304/igc - svn co https://github.com/jim3ma/synology-igc/trunk/igc rp-ext_wjz304/igc - - - name: Get exts lsit shell: python run: | @@ -183,13 +168,6 @@ jobs: exts["pocopico"] = getextslist('rp-ext_pocopico', reglist) lkms["pocopico"] = getlkmslist('rp-ext_pocopico', reglist) - print('####################### wjz304 #######################') - reglist=[] - reglist.append(['https://raw.githubusercontent.com/wjz304/rp-ext/master/','']) - reglist.append(['https://raw.githubusercontent.com/jim3ma/synology-igc/master/','']) - exts["wjz304"] = getextslist('rp-ext_wjz304', reglist) - lkms["wjz304"] = getlkmslist('rp-ext_wjz304', reglist) - if len(exts) > 0: print('####################### exts #######################') print(json.dumps(exts, indent=4)) @@ -257,7 +235,7 @@ jobs: try: lkms = {} with open('lkms.json', mode="r") as f: - lkms = json.loads(f.read())['wjz304'] # 暂时只匹配自己 + lkms = json.loads(f.read())['pocopico'] platforms = os.listdir(os.path.join(root, work, 'config')) platforms.sort() diff --git a/docs/Issues.html b/docs/Issues.html index 86f6353..d9f2212 100644 --- a/docs/Issues.html +++ b/docs/Issues.html @@ -54,7 +54,7 @@