zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2025-12-24 13:28:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Mon Nov 18 19:38:12 CET 2024

Browse Source
This commit is contained in:
github-action[bot]
2024-11-18 19:38:13 +01:00
parent c4d692c891
commit eabc1624e4
176 changed files with 3172 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
openwrt-passwall2/.github/ISSUE_TEMPLATE/bug.yml vendored
View File

@@ -1,5 +1,5 @@
name: Bug上报
description: 报告您使用中遇到的Bug以帮助我们改进
name: Bug Reporting
description: Report any Bugs you encounter to help us improve.
title: "[Bug]: "
labels: bug
@@ -8,68 +8,68 @@ body:
id: tips
attributes:
value: |
请按此规范填写，有效的反馈能让我们更好地解决您的问题
Please fill in this specification. Effective feedback will help us better solve your problem.
- type: textarea
id: description
attributes:
label: 描述您遇到的bug
description: 请尽可能简单清晰地描述问题
label: Describe the Bug you encountered
description: Please describe the problem as simply and clearly as possible.
validations:
required: true
- type: textarea
id: steps
attributes:
label: 复现此Bug的步骤
label: Steps to reproduce this Bug
placeholder: |
1. 选择菜单'...'
2. 点击按钮'....'
3. 然后...
4. 出现Bug：
1. Select Menu'...'
2. Click the button'....'
3. Then...
4. Appear:
validations:
required: true
- type: textarea
id: purpose
attributes:
label: 您想要实现的目的
description: 请尽可能简单清晰地描述您期望发生的事
label: What you want to implement
description: Please describe what you expect to happen as simply and clearly as possible.
validations:
required: true
- type: textarea
id: logs
attributes:
label: 日志信息
description: 提交包括问题相关的所有系统日志信息（这个很重要）
label: Log information
description: Submit all system log information related to the problem (this is very important).
validations:
required: true
- type: textarea
id: pics
attributes:
label: 截图
description: 如果适用，您可以添加屏幕截图以便更好地解释您的问题
label: Screenshot
description: If applicable, you can add screenshots to better explain your problem.
validations:
required: false
- type: textarea
id: environment
attributes:
label: 系统相关信息
description: 填写相关信息以便更好的确定问题
label: System related information
description: Fill in relevant information to better identify the problem.
placeholder: |
- Passwall2版本：
- 浏览器版本（如Chrome 96.0.4664.45 64位 正式版）：
- 其他：
- Passwall2 version:
- Browser version (such as Chrome 96.0.4664.45 64-bit official version):
- Other：
validations:
required: true
- type: textarea
id: supplements
attributes:
label: 其他信息
description: 与此Bug相关的其他信息
label: Other Information
description: Other information related to this Bug.
validations:
required: false

20
openwrt-passwall2/.github/ISSUE_TEMPLATE/feature.yml vendored
View File

@@ -1,5 +1,5 @@
name: 功能请求
description: 为此项目提出关于新功能的想法
name: Feature Requests
description: Propose new feature ideas for this project.
title: "[Feature Request]: "
labels: enhancement
@@ -7,31 +7,31 @@ body:
- type: textarea
id: description
attributes:
label: 描述你想要的新功能
description: 尽可能简单清晰地描述你想要的新功能或是希望解决的问题
label: Describe the new feature you want
description: Describe the new feature you want or the problem you want solved as simply and clearly as possible.
validations:
required: true
- type: textarea
id: ideal-solution
attributes:
label: 描述你想要的解决方案
description: 尽可能简单清晰地描述你想要的新功能
label: Describe the solution you want
description: Describe the new feature you want as simply and clearly as possible.
validations:
required: true
- type: textarea
id: other-solutions
attributes:
label: 描述你考虑过的替代方案
description: 尽可能简单清晰地描述你考虑过的任何替代解决方案或功能
label: Describe the alternatives you considered
description: Describe any alternative solutions or features you considered as simply and clearly as possible.
validations:
required: false
- type: textarea
id: supplements
attributes:
label: 其他信息
description: 在此处添加有关功能请求的任何其他信息或屏幕截图
label: Other Information
description: Add any other information or screenshots about your feature request here.
validations:
required: false

87
openwrt-passwall2/.github/workflows/Auto compile with openwrt sdk.yml vendored
View File

@@ -21,6 +21,7 @@ env:
passwall2: ${{ github.repository }}
packages: xiaorouji/openwrt-passwall-packages
jobs:
job_check:
name: Check Version
@@ -28,27 +29,29 @@ jobs:
outputs:
passwall2_version: ${{ steps.check_version.outputs.latest_version }}
has_update: ${{ steps.check_version.outputs.has_update }}
prerelease: ${{ steps.check_version.outputs.prerelease }}
steps:
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 0
ref: 'main'
ref: ${{ github.ref_name }}
- name: Check version
id: check_version
env:
url_release: https://api.github.com/repos/${{ env.passwall2 }}/releases/latest
url_tags: https://api.github.com/repos/${{ env.passwall2 }}/tags
run: |
cd luci-app-passwall2
latest_version=$(awk -F ':=' '/PKG_VERSION|PKG_RELEASE/ {print $2}' Makefile | sed ':a;N;s/\n$//;s/\n/-/;ba')
latest_release=$(wget -qO- -t1 -T2 ${{env.url_release}} | awk -F '"' '/tag_name/{print $4}')
has_update=$([ "${latest_version}" != "${latest_release}" ] && echo true || echo false)
latest_version=$(awk -F ':=' '/PKG_VERSION|PKG_RELEASE/ {print $2}' Makefile | sed ':a;N;s/\$(PKG_VERSION)-//;s/\n$//;s/\n/-/;ba')
has_update=$([ -z "$(wget -qO- -t1 -T2 ${{env.url_tags}} | grep \"${latest_version}\")" ] && echo true || echo false)
prerelease=$([ "${{ github.ref_name }}" == "main" ] && echo false || echo true)
echo "latest_version=${latest_version}" >> $GITHUB_OUTPUT
echo "has_update=${has_update}" >> $GITHUB_OUTPUT
echo "prerelease=${prerelease}" >> $GITHUB_OUTPUT
echo "latest_version: ${latest_version}"
echo "latest_release: ${latest_release}"
echo "has_update: ${has_update}"
echo "prerelease: ${prerelease}"
- name: Prepare release
if: steps.check_version.outputs.has_update == 'true'
@@ -66,6 +69,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{steps.check_version.outputs.latest_version}}
target_commitish: ${{ github.ref_name }}
prerelease: ${{steps.check_version.outputs.prerelease}}
body_path: release.txt
@@ -85,13 +90,11 @@ jobs:
- sdk_ver: 23.05
luci_ver: 23.05
sdk_url: https://downloads.openwrt.org/releases/23.05.0/targets/x86/64/openwrt-sdk-23.05.0-x86-64_gcc-12.3.0_musl.Linux-x86_64.tar.xz
steps:
- name: Install packages
run: |
docker rmi `docker images -q`
sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android
df -hT
echo "Install packages"
sudo -E apt-get -qq update
sudo -E apt-get -qq install build-essential clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev python3-distutils python3-setuptools rsync swig unzip zlib1g-dev file wget
@@ -103,68 +106,52 @@ jobs:
uses: actions/cache@v4
with:
path: sdk
key: openwrt-sdk-23.05-rc3-x86_64
key: openwrt-luci-${{ matrix.luci_ver }}-x86_64
- name: Initialization environment
if: steps.cache-sdk.outputs.cache-hit != 'true'
env:
url_sdk: https://downloads.openwrt.org/releases/23.05.0/targets/x86/64/openwrt-sdk-23.05.0-x86-64_gcc-12.3.0_musl.Linux-x86_64.tar.xz
run: |
wget ${{ env.url_sdk }}
file_name=$(echo ${{env.url_sdk}} | awk -F/ '{print $NF}')
wget ${{ matrix.sdk_url }}
file_name=$(echo ${{ matrix.sdk_url }} | awk -F/ '{print $NF}')
mkdir sdk && tar -xJf $file_name -C ./sdk --strip-components=1
cd sdk
echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-${{ matrix.sdk_ver }}" > feeds.conf
echo "src-git packages https://github.com/openwrt/packages.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf
echo "src-git luci https://github.com/openwrt/luci.git;openwrt-${{ matrix.luci_ver }}" >> feeds.conf
echo "src-git routing https://git.openwrt.org/feed/routing.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf
echo "src-git passwall_packages https://github.com/${{ env.packages}}.git;main" >> feeds.conf
echo "src-git passwall2 https://github.com/${{ env.passwall2 }}.git;main" >> feeds.conf
echo "src-git passwall_packages https://github.com/${{ env.packages }}.git;main" >> feeds.conf
echo "src-git passwall2 https://github.com/${{ env.passwall2 }}.git;${{ github.ref_name }}" >> feeds.conf
./scripts/feeds update -a
echo "CONFIG_PACKAGE_luci-app-passwall2=m" > .config
./scripts/feeds install -d n luci-app-passwall2
make download -j8
make package/luci-app-passwall2/download -j1
- name: Configure passwall2
- name: Update passwall2 feeds
if: steps.cache-sdk.outputs.cache-hit == 'true'
run: |
cd sdk
sed -i '6s/main/${{ github.ref_name }}/' feeds.conf
./scripts/feeds update passwall_packages
./scripts/feeds update passwall2
./scripts/feeds install luci-app-passwall2
echo "CONFIG_ALL_NONSHARED=n" > .config
echo "CONFIG_ALL_KMODS=n" >> .config
echo "CONFIG_ALL=n" >> .config
echo "CONFIG_AUTOREMOVE=n" >> .config
echo "CONFIG_LUCI_LANG_zh_Hans=y" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2=m" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_Iptables_Transparent_Proxy=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_Nftables_Transparent_Proxy=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Haproxy=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Hysteria=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_IPv6_Nat=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_NaiveProxy=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Client=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Server=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Client=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Server=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Client=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Simple_Obfs=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_SingBox=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin=n" >> .config
make defconfig
- name: Compile passwall2
id: compile
run: |
cd sdk
echo "make package/luci-app-passwall2/{clean,compile} -j$(nproc)"
echo "CONFIG_ALL_NONSHARED=n" > .config
echo "CONFIG_ALL_KMODS=n" >> .config
echo "CONFIG_ALL=n" >> .config
echo "CONFIG_AUTOREMOVE=n" >> .config
echo "CONFIG_LUCI_LANG_zh_Hans=y" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2=m" >> .config
make defconfig
echo "make package/luci-app-passwall2/{clean,compile} -j1"
make package/luci-app-passwall2/{clean,compile} -j1
mv bin/packages/x86_64/passwall2/ ../
make clean
rm .config .config.old
rm -rf feeds/passwall2 feeds/passwall2.*
cd ../passwall2
for i in $(ls); do mv $i luci-${{ matrix.luci_ver }}_$i; done
cd ..
@@ -182,7 +169,7 @@ jobs:
job_auto_compile:
if: needs.job_check.outputs.has_update == 'true'
if: ${{ needs.job_check.outputs.has_update == 'true' && needs.job_check.outputs.prerelease == 'false' }}
needs: job_check
runs-on: ubuntu-latest
name: build (${{ matrix.platform }})
@@ -246,7 +233,6 @@ jobs:
run: |
docker rmi `docker images -q`
sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android
df -hT
echo "install packages!!!!!!"
sudo -E apt-get -qq update
sudo -E apt-get -qq install build-essential clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev python3-distutils python3-setuptools rsync swig unzip zlib1g-dev file wget
@@ -271,7 +257,7 @@ jobs:
echo "src-git packages https://github.com/openwrt/packages.git;openwrt-23.05" >> feeds.conf
echo "src-git luci https://github.com/openwrt/luci.git;openwrt-23.05" >> feeds.conf
echo "src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05" >> feeds.conf
echo "src-git passwall_packages https://github.com/${{ env.packages}}.git;main" >> feeds.conf
echo "src-git passwall_packages https://github.com/${{ env.packages }}.git;main" >> feeds.conf
echo "src-git passwall2 https://github.com/${{ env.passwall2 }}.git;main" >> feeds.conf
./scripts/feeds update -a
@@ -281,12 +267,11 @@ jobs:
rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
echo "CONFIG_ALL_NONSHARED=n" > .config
echo "CONFIG_ALL_KMODS=n" >> .config
echo "CONFIG_ALL=n" >> .config
echo "CONFIG_AUTOREMOVE=n" >> .config
echo "CONFIG_SIGNED_PACKAGES=n" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2=m" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_Iptables_Transparent_Proxy=y" >> .config
echo "CONFIG_PACKAGE_luci-app-passwall2_Nftables_Transparent_Proxy=y" >> .config
@@ -311,7 +296,7 @@ jobs:
- name: ${{ matrix.platform }} download
run: |
cd sdk
make download -j8
make download -j1
find dl -size -1024c -exec ls -l {} \;
- name: ${{ matrix.platform }} compile
@@ -320,7 +305,7 @@ jobs:
cd sdk
for package in $(ls feeds/passwall_packages); do
if [ -d "feeds/passwall_packages/$package" ]; then
make package/feeds/passwall_packages/$package/compile -j$(nproc) 2>/dev/null
make package/feeds/passwall_packages/$package/compile -j1 2>/dev/null
fi
done
@@ -333,7 +318,7 @@ jobs:
cd sdk
mkdir upload
zip -jr upload/passwall2_packages_ipk_${{ matrix.platform }}.zip bin/packages/*/passwall_packages/
zip -jr upload/passwall_packages_ipk_${{ matrix.platform }}.zip bin/packages/*/passwall_packages/*.ipk
echo "FIRMWARE=$PWD" >> $GITHUB_ENV
echo "status=success" >> $GITHUB_OUTPUT

4
openwrt-passwall2/.github/workflows/Close stale issues and Prs.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
stale-issue-label: "no-issue-activity"
exempt-issue-labels: "awaiting-approval,awaiting,work-in-progress"
stale-pr-label: "no-pr-activity"
exempt-pr-labels: "awaiting-approval,awaiting,work-in-progress"
exempt-pr-labels: "awaiting-approval,awaiting,work-in-progress,automated-pr"
# only-labels: 'bug,enhancement'
days-before-issue-stale: 10
days-before-pr-stale: 10
@@ -23,7 +23,7 @@ jobs:
operations-per-run: 500
- name: Delete workflow runs
uses: Mattraks/delete-workflow-runs@v2.0.3
uses: Mattraks/delete-workflow-runs@main
with:
token: ${{ github.token }}
repository: ${{ github.repository }}