From 2dbe9c86fa02f1b2b971ed1bbab5abe4ec3d5978 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 01:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B4=20Sync=202024-01-10=2001:26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-beardropper/.gitattributes | 2 - luci-app-beardropper/.gitignore | 2 - .../.github/workflows/release-build.yml | 73 ------- luci-app-onliner/.gitattributes | 2 - luci-app-onliner/.gitignore | 2 - .../.github/workflows/build-package-onx86.yml | 189 ------------------ .../.github/ISSUE_TEMPLATE/bug-report.yml | 58 ------ .../.github/ISSUE_TEMPLATE/config.yml | 2 - .../ISSUE_TEMPLATE/feature-request.yml | 27 --- .../.github/build-ipk.sh | 79 -------- .../.github/workflows/build-ipk.yml | 61 ------ tencentcloud_cos/.gitignore | 1 - 12 files changed, 498 deletions(-) delete mode 100644 luci-app-beardropper/.gitattributes delete mode 100644 luci-app-beardropper/.gitignore delete mode 100644 luci-app-mosdns/.github/workflows/release-build.yml delete mode 100644 luci-app-onliner/.gitattributes delete mode 100644 luci-app-onliner/.gitignore delete mode 100644 luci-app-pushbot/.github/workflows/build-package-onx86.yml delete mode 100644 luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/bug-report.yml delete mode 100644 luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/feature-request.yml delete mode 100755 luci-app-unblockneteasemusic/.github/build-ipk.sh delete mode 100644 luci-app-unblockneteasemusic/.github/workflows/build-ipk.yml delete mode 100644 tencentcloud_cos/.gitignore diff --git a/luci-app-beardropper/.gitattributes b/luci-app-beardropper/.gitattributes deleted file mode 100644 index dfe07704..00000000 --- a/luci-app-beardropper/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/luci-app-beardropper/.gitignore b/luci-app-beardropper/.gitignore deleted file mode 100644 index 9bea4330..00000000 --- a/luci-app-beardropper/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -.DS_Store diff --git a/luci-app-mosdns/.github/workflows/release-build.yml b/luci-app-mosdns/.github/workflows/release-build.yml deleted file mode 100644 index ae90b5f0..00000000 --- a/luci-app-mosdns/.github/workflows/release-build.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Build - -on: - push: - tags: - - v5.** - -jobs: - build: - name: Build ${{ matrix.arch }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - arch: - - aarch64_cortex-a53 - - aarch64_cortex-a72 - - aarch64_generic - - arm_arm1176jzf-s_vfp - - arm_arm926ej-s - - arm_cortex-a15_neon-vfpv4 - - arm_cortex-a5_vfpv4 - - arm_cortex-a7 - - arm_cortex-a7_neon-vfpv4 - - arm_cortex-a8_vfpv3 - - arm_cortex-a9 - - arm_cortex-a9_neon - - arm_cortex-a9_vfpv3-d16 - - arm_fa526 - - arm_mpcore - - arm_xscale - - i386_pentium-mmx - - i386_pentium4 - - mips64_octeonplus - - mips_24kc - - mips_4kec - - mips_mips32 - - mipsel_24kc - - mipsel_24kc_24kf - - mipsel_74kc - - mipsel_mips32 - - x86_64 - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Get v2ray-geodata - run: | - git clone https://github.com/sbwml/v2ray-geodata - - - name: Building packages - uses: sbwml/openwrt-gh-action-sdk@go1.21 - env: - ARCH: ${{ matrix.arch }}-openwrt-22.03 - FEEDNAME: packages_ci - PACKAGES: luci-app-mosdns - NO_REFRESH_CHECK: true - - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.arch }} - path: bin/packages/${{ matrix.arch }}/packages_ci/*.ipk - - - name: Upload packages - uses: ncipollo/release-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - allowUpdates: true - replacesArtifacts: true - artifacts: "bin/packages/${{ matrix.arch }}/packages_ci/*.ipk" diff --git a/luci-app-onliner/.gitattributes b/luci-app-onliner/.gitattributes deleted file mode 100644 index dfe07704..00000000 --- a/luci-app-onliner/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/luci-app-onliner/.gitignore b/luci-app-onliner/.gitignore deleted file mode 100644 index 5b9bd874..00000000 --- a/luci-app-onliner/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.bak diff --git a/luci-app-pushbot/.github/workflows/build-package-onx86.yml b/luci-app-pushbot/.github/workflows/build-package-onx86.yml deleted file mode 100644 index d56a7c66..00000000 --- a/luci-app-pushbot/.github/workflows/build-package-onx86.yml +++ /dev/null @@ -1,189 +0,0 @@ -# -# Copyright (c) 2019-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# -# https://github.com/P3TERX/Actions-OpenWrt -# Description: Build OpenWrt using GitHub Actions -# - -name: Build luci-app-pushbot-x86 - -on: - repository_dispatch: - workflow_dispatch: - inputs: - ssh: - description: 'SSH connection to Actions' - required: false - default: 'false' -# schedule: -# - cron: 10 14 * * 5 - -env: - SDK_URL: https://downloads.openwrt.org/releases/22.03.0-rc5/targets/x86/64/openwrt-sdk-22.03.0-rc5-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz - PackageName: luci-app-pushbot - PackageSource_URL: https://github.com/zzsj0928/luci-app-pushbot - UPLOAD_Package: true - UPLOAD_COWTRANSFER: false - UPLOAD_WETRANSFER: true - UPLOAD_RELEASE: true - TZ: Asia/Shanghai - UPLOAD_ZZNAS: false - ftp_username: ${{ secrets.FTP_USERNAME }} - ftp_psw: ${{ secrets.FTP_PSW }} - ftp_ip: ${{ secrets.FTP_IP }} - TargetPath: OpenwrtImgs/packages/luci-app-pushbot - upload_file: luci-app-pushbot_* - whkey: ${{ secrets.WEBHOOK }} - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@main - - - name: Initialization environment - env: - DEBIAN_FRONTEND: noninteractive - run: | - sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc - sudo -E apt-get -qq update - sudo -E apt-get -qq install $(curl -fsSL git.io/depends-ubuntu-2004) - sudo -E apt-get -qq autoremove --purge - sudo -E apt-get -qq clean - sudo timedatectl set-timezone "$TZ" - sudo mkdir -p /workdir - sudo chown $USER:$GROUPS /workdir - - - name: Clone source code - working-directory: /workdir - run: | - df -hT $PWD - wget $SDK_URL - mkdir /workdir/openwrt - tar xf openwrt-sdk-* -C /workdir/openwrt --strip-components 1 - ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt - - - name: Update feeds - run: cd openwrt && ./scripts/feeds update -a - - - name: Install feeds - run: cd openwrt && ./scripts/feeds install -a - - - name: Load custom configuration - run: | - cd openwrt - git clone $PackageSource_URL package/$PackageName - make defconfig - echo "CONFIG_PACKAGE_$PackageName=y" >> ./.config - - - - name: SSH connection to Actions - uses: P3TERX/ssh2actions@v1.0.0 - if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh') - env: - TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }} - TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} - - - name: Compile the package - id: compile - run: | - send_dingding="curl -s \"https://oapi.dingtalk.com/robot/send?access_token=${whkey}\" -H 'Content-Type: application/json' -d '{\"msgtype\": \"markdown\",\"markdown\": {\"title\":" - send_content0="【${PackageName}】正在启动编译！请稍后大约4小时..." - markdown_splitline="\n\n---\n\n" - GITHUB_WORKFLOW_URL=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID - nowtime=`date "+%Y-%m-%d %H:%M:%S"` - eval "$send_dingding \"${send_content0}\",\"text\":\"${nowtime} $markdown_splitline #### ${send_content0}\n\n[点此链接查看](${GITHUB_WORKFLOW_URL})\"}}'" - - - cd openwrt - echo -e "$(nproc) thread compile" - make package/$PackageName/compile V=s - echo "::set-output name=status::success" - - - name: Check space usage - if: (!cancelled()) - run: df -hT - - - name: Organize files - id: organize - if: env.UPLOAD_Package == 'true' && !cancelled() - run: | - cd openwrt/bin/packages/*/base - echo "PackagePath=$PWD" >> $GITHUB_ENV - echo "::set-output name=status::success" - - - name: Upload package - uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && !cancelled() - with: - name: ${{ env.upload_file }} - path: ${{ env.PackagePath }} - - - name: Upload package to cowtransfer - id: cowtransfer - if: steps.organize.outputs.status == 'success' && env.UPLOAD_COWTRANSFER == 'true' && !cancelled() - run: | - curl -fsSL git.io/file-transfer | sh - ./transfer cow --block 2621440 -s -p 64 --no-progress ${PackagePath}/${upload_file} 2>&1 | tee cowtransfer.log - echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)" - echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")" - - - name: Upload firmware to WeTransfer - id: wetransfer - if: steps.organize.outputs.status == 'success' && env.UPLOAD_WETRANSFER == 'true' && !cancelled() - run: | - curl -fsSL git.io/file-transfer | sh - ./transfer wet -s -p 16 --no-progress ${PackagePath}/${upload_file} 2>&1 | tee wetransfer.log - echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)" - echo "::set-output name=url::$(cat wetransfer.log | grep https | cut -f3 -d" ")" - - - name: Upload firmware to my NAS - id: zz-nas - if: steps.organize.outputs.status == 'success' && env.UPLOAD_ZZNAS == 'true' && !cancelled() - run: | - send_dingding="curl -s \"https://oapi.dingtalk.com/robot/send?access_token=${whkey}\" -H 'Content-Type: application/json' -d '{\"msgtype\": \"markdown\",\"markdown\": {\"title\":" - send_content1="【${PackageName}】编译成功！正在上传固件到NAS..." - send_content2="【${PackageName}】编译成功！固件成功上传到NAS。" - markdown_splitline="\n\n---\n\n" - GITHUB_WORKFLOW_URL=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID - nowtime=`date "+%Y-%m-%d %H:%M:%S"` - eval "$send_dingding \"${send_content1}\",\"text\":\"${nowtime} $markdown_splitline #### ${send_content1}\n\n[点此链接查看](${GITHUB_WORKFLOW_URL})\"}}'" - - cd openwrt/bin/packages/*/base - echo $ftp_psw > /tmp/rsync.psw && chmod 600 /tmp/rsync.psw - rsync -avrzP $upload_file_1 $ftp_username@$ftp_ip::$TargetPath/$(date +"%Y.%m.%d-%H%M")/ --password-file=/tmp/rsync.psw - echo "::warning file=zz-nas.com::All Released Files Uploaded to ZZ-NAS" - - nowtime=`date "+%Y-%m-%d %H:%M:%S"` - eval "$send_dingding \"${send_content2}\",\"text\":\"${nowtime} $markdown_splitline #### ${send_content2}\n\n[点此链接查看](${GITHUB_WORKFLOW_URL})\"}}'" - - - name: Generate release tag - id: tag - if: env.UPLOAD_RELEASE == 'true' && !cancelled() - run: | - echo "::set-output name=release_tag::$(date +"%Y.%m.%d-%H%M")" - touch release.txt - [ $UPLOAD_COWTRANSFER = true ] && echo "🔗 [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt - [ $UPLOAD_WETRANSFER = true ] && echo "🔗 [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt - echo "::set-output name=status::success" - - - name: Upload package to release - uses: softprops/action-gh-release@v1 - if: steps.tag.outputs.status == 'success' && !cancelled() - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.tag.outputs.release_tag }} - body_path: release.txt - files: ${{ env.PackagePath }}/${{ env.upload_file }} - - - name: Delete workflow runs - uses: GitRML/delete-workflow-runs@main - with: - retain_days: 1 - keep_minimum_runs: 3 diff --git a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/bug-report.yml b/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/bug-report.yml deleted file mode 100644 index 3e58fee2..00000000 --- a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/bug-report.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Bug 报告 -description: 在使用过程中遇到错误或非预期行为。 -labels: - - bug -body: - - type: textarea - id: description - attributes: - label: Bug 描述 - description: 简明地描述您所遇到的 Bug。 - validations: - required: true - - type: textarea - id: expected - attributes: - label: 预期行为 - description: 简明地描述您所希望发生的行为。 - - type: textarea - id: behaviour - attributes: - label: 实际行为 - description: 简明地描述实际发生的行为。 - - type: textarea - id: reproduce - attributes: - label: 复现步骤 - description: 复现报告行为的步骤。 - - type: textarea - id: debug-log - attributes: - label: 调试报告 - description: | - 使用下面的命令打印调试报告，以便我们排查问题。请注意，您只需贴上最后的链接，不必复制整个输出。 - 如果您使用 JavaScript 版本的插件，可以直接在 `状态信息` 中点击 `打印报告`。 - ```/usr/bin/unm-debug``` - validations: - required: true - - type: textarea - id: additional - attributes: - label: 其他信息 - description: 其他任何您认为有意义的信息。 - - type: checkboxes - id: terms - attributes: - label: 条款 - description: 提交此 issue 即表明您同意以下条款。 - options: - - label: 我确认我使用的插件是由 UnblockNeteaseMusic 项目或 ImmortalWrt 项目官方发行。 - required: true - - label: 我确认我已经升级到了最新的插件版本（包括核心和插件）。 - required: true - - label: 我确认我安装了正确版本的插件（基于 lua 语言的 LuCI 只能使用 2.x 版本）。 - required: true - - label: 我确认我没有混用 iptables 和 nftables 规则。 - required: true - - label: 我确认我已经在对应的客户端正确安装了 CA 证书。 - required: true diff --git a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/config.yml b/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index bd9dfe4e..00000000 --- a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -blank_issues_enabled: false diff --git a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/feature-request.yml b/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/feature-request.yml deleted file mode 100644 index 94c654a5..00000000 --- a/luci-app-unblockneteasemusic/.github/ISSUE_TEMPLATE/feature-request.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: 功能请求 -description: 请求加入新的功能以满足您的日常使用所需。 -labels: - - enhancement -body: - - type: textarea - id: description - attributes: - label: 需求描述 - description: 清晰明了地描述您的需求。 - validations: - required: true - - type: textarea - id: expected - attributes: - label: 预期行为 - description: 简明地描述您所希望发生的行为。 - - type: input - id: openwrt-version - attributes: - label: OpenWrt 版本 - description: 您所使用的 OpenWrt 版本号。 - - type: textarea - id: additional - attributes: - label: 其他信息 - description: 其他任何您认为有意义的信息。 diff --git a/luci-app-unblockneteasemusic/.github/build-ipk.sh b/luci-app-unblockneteasemusic/.github/build-ipk.sh deleted file mode 100755 index 52f66294..00000000 --- a/luci-app-unblockneteasemusic/.github/build-ipk.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2021-2022 Tianling Shen - -export PKG_SOURCE_DATE_EPOCH="$(date "+%s")" - -BASE_DIR="$(cd "$(dirname $0)"; pwd)" -PKG_DIR="$BASE_DIR/.." - -function get_mk_value() { - awk -F "$1:=" '{print $2}' "$PKG_DIR/Makefile" | xargs -} - -PKG_NAME="$(get_mk_value "PKG_NAME")" -if [ "$RELEASE_TYPE" == "release" ]; then - PKG_VERSION="$(get_mk_value "PKG_VERSION")-$(get_mk_value "PKG_RELEASE")" -else - PKG_VERSION="dev-$PKG_SOURCE_DATE_EPOCH-$(git rev-parse --short HEAD)" -fi - -TEMP_DIR="$(mktemp -d -p $BASE_DIR)" -TEMP_PKG_DIR="$TEMP_DIR/$PKG_NAME" -mkdir -p "$TEMP_PKG_DIR/CONTROL/" -mkdir -p "$TEMP_PKG_DIR/lib/upgrade/keep.d/" -mkdir -p "$TEMP_PKG_DIR/usr/lib/lua/luci/" - -cp -fpR "$PKG_DIR/luasrc"/* "$TEMP_PKG_DIR/usr/lib/lua/luci/" -cp -fpR "$PKG_DIR/root"/* "$TEMP_PKG_DIR/" - -echo -e "/etc/config/unblockneteasemusic" > "$TEMP_PKG_DIR/CONTROL/conffiles" -cat > "$TEMP_PKG_DIR/lib/upgrade/keep.d/$PKG_NAME" <<-EOF -/usr/share/unblockneteasemusic/core/ -/usr/share/unblockneteasemusic/core_local_ver -/usr/share/unblockneteasemusic/server.crt -/usr/share/unblockneteasemusic/server.key -EOF - -cat > "$TEMP_PKG_DIR/CONTROL/control" <<-EOF - Package: $PKG_NAME - Version: $PKG_VERSION - Depends: libc,$(get_mk_value "LUCI_DEPENDS" | xargs | tr " +" ", ") - Source: https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic - SourceName: $PKG_NAME - Section: luci - SourceDateEpoch: $PKG_SOURCE_DATE_EPOCH - Maintainer: Tianling Shen - Architecture: all - Installed-Size: TO-BE-FILLED-BY-IPKG-BUILD - Description: LuCI support for UnblockNeteaseMusic -EOF - -echo -e '#!/bin/sh -[ "${IPKG_NO_SCRIPT}" = "1" ] && exit 0 -[ -s ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0 -. ${IPKG_INSTROOT}/lib/functions.sh -default_postinst $0 $@' > "$TEMP_PKG_DIR/CONTROL/postinst" -chmod 0755 "$TEMP_PKG_DIR/CONTROL/postinst" - -echo -e "[ -n "\${IPKG_INSTROOT}" ] || { - (. /etc/uci-defaults/$PKG_NAME) && rm -f /etc/uci-defaults/$PKG_NAME - rm -f /tmp/luci-indexcache - rm -rf /tmp/luci-modulecache/ - exit 0 -}" > "$TEMP_PKG_DIR/CONTROL/postinst-pkg" -chmod 0755 "$TEMP_PKG_DIR/CONTROL/postinst-pkg" - -echo -e '#!/bin/sh -[ -s ${IPKG_INSTROOT}/lib/functions.sh ] || exit 0 -. ${IPKG_INSTROOT}/lib/functions.sh -default_prerm $0 $@' > "$TEMP_PKG_DIR/CONTROL/prerm" -chmod 0755 "$TEMP_PKG_DIR/CONTROL/prerm" - -curl -fsSL "https://raw.githubusercontent.com/openwrt/openwrt/master/scripts/ipkg-build" -o "$TEMP_DIR/ipkg-build" -chmod 0755 "$TEMP_DIR/ipkg-build" -"$TEMP_DIR/ipkg-build" -m "" "$TEMP_PKG_DIR" "$TEMP_DIR" - -mv "$TEMP_DIR/${PKG_NAME}_${PKG_VERSION}_all.ipk" "$BASE_DIR" -rm -rf "$TEMP_DIR" diff --git a/luci-app-unblockneteasemusic/.github/workflows/build-ipk.yml b/luci-app-unblockneteasemusic/.github/workflows/build-ipk.yml deleted file mode 100644 index cbbeccf7..00000000 --- a/luci-app-unblockneteasemusic/.github/workflows/build-ipk.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build ipk for luci-app-unblockneteasemusic - -on: - push: - branches: - - 'master' - paths: - - 'luasrc/**' - - 'root/**' - - 'Makefile' - - '.github/**' - - pull_request: - branches: - - 'master' - types: - - opened - - synchronize - - reopened - paths: - - 'luasrc/**' - - 'root/**' - - 'Makefile' - - '.github/**' - - release: - types: - - published - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout source tree - uses: actions/checkout@v3 - - - name: Build ipk file - env: - RELEASE_TYPE: ${{ github.event_name }} - run: | - pushd .github - fakeroot bash build-ipk.sh - echo "ASSET_NAME=$(ls *.ipk)" >> $GITHUB_ENV - popd - - - name: Publishing to GitHub Artifacts - uses: actions/upload-artifact@v3 - if: github.event_name != 'release' - with: - name: ${{ env.ASSET_NAME }} - path: .github/*.ipk - - - name: Publishing to GitHub Releases - uses: floralatin/upload-release-action@3688e13ae053ba3052eb4f0cfe03e78deb8f88d7 - if: github.event_name == 'release' - with: - repo_token: ${{ github.token }} - file: .github/*.ipk - tag: ${{ github.ref }} - file_glob: true diff --git a/tencentcloud_cos/.gitignore b/tencentcloud_cos/.gitignore deleted file mode 100644 index 496ee2ca..00000000 --- a/tencentcloud_cos/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store \ No newline at end of file