Compare commits

..

No commits in common. "30778d675f8d4d53e71323c0786bfceec34321c8" and "0c9520d40265210cb86ba42b3a4a0cd4f66c2427" have entirely different histories.

7 changed files with 2725 additions and 10122 deletions

View File

@ -1,54 +0,0 @@
name: send GFWList
on:
push:
paths:
- 'list.txt'
branches:
- master
workflow_dispatch:
jobs:
convert-and-push:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
with:
submodules: 'true'
fetch-depth: '0'
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y file git openssl perl
- name: Sanity check.
run: |
for cmd in date file git openssl perl; do
command -v $cmd >/dev/null 2>&1 || { echo "Error: You must have $cmd command installed!"; exit 1; }
done
- name: update date and checksum
run: |
cp apollyon/* ./
perl addChecksum.pl list.txt || { echo "Error: Failed to update checksum"; exit 1; }
if [ "$(file -b list.txt | grep -o "ASCII text")" != "ASCII text" ]; then
echo "Error: list.txt invalid, please make sure:"
echo "1. there is no non-ASCII characters;"
echo "2. configure your text editor to use unix style line break."
exit 1
fi
echo "DATE=$(date)" >> $GITHUB_ENV
- name: convert to gfwlist.txt
run: |
openssl base64 -in list.txt | tr -d '\r' > gfwlist.txt
- name: save local changes to git & svn
id: auto-commit-action
uses: stefanzweifel/git-auto-commit-action@v7
with:
commit_message: gfwlist edited ${{ env.DATE }}
file_pattern: 'gfwlist.txt'

1
.gitignore vendored
View File

@ -0,0 +1 @@
list.txt

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "apollyon"]
path = apollyon
url = https://github.com/gfwlist/apollyon

View File

@ -16,7 +16,7 @@ Support languages:
:tulip:***如需获取 GFWList 的精简版本,请访问 [tinylist 项目主页](https://github.com/gfwlist/tinylist)。***
******
:hammer:***如需获取 GFWList 维护工具的源代码,请访问 [apollyon 项目](https://github.com/gfwlist/apollyon)。***
:hammer:***如需获取源自目前正在维护的高级 GFWList 的源代码,请访问 [apollyon 项目](https://github.com/gfwlist/apollyon)。***
******
# gfwlist
@ -24,21 +24,15 @@ Support languages:
## 如果您想报告新的网址,请务必先查看我们的 [wiki](https://github.com/gfwlist/gfwlist/wiki/Cautions)。
## 如果您想要求匿名,您可以直接向我们发送报告
### 请将您的报告发送至 [gfwlistreport@proton.me](mailto:gfwlistreport@proton.me) 发送给bocchi810 或者 [gfw@dyi.ng](mailto:gfw@dyi.ng) 发送给cicku
### 为了保护您的隐私,请不要将报告邮件发送到非以上两个邮箱的其他地址(包括维护者主页的个人邮箱)
## 如果您想要求匿名,您可以直接向我们发送报告,请访问 [此个人资料](https://github.com/cicku) 以获取电子邮件地址。
警告:
* 由于特殊的网络控制,处理来自以下地区或运营商用户的报告是不切实际的:
* 由于特殊的网络控制,处理来自以下省份用户的报告是不切实际的:
- 新疆
- 中国移动
- 中国广电(蜂窝移动数据)
- 新疆(新疆维吾尔自治区)
新疆和中国移动都有自己的一份审查名单,中国广电使用中国移动的骨干网,会受到中国移动的审查影响
例如:百度网盘不允许在新疆使用,但将其添加到列表中会给居住在该国其他地区的人们带来麻烦。
因此,鼓励这些地区内的任何用户要么维护自定义规则,要么始终使用代理。
@ -51,15 +45,18 @@ GFWList URLGithubhttps://raw.githubusercontent.com/gfwlist/gfwlist/mast
**尽管 Github 有能力进行分发,但为了避免中断或连接问题,我们仍然建议使用以下任何 URL。**
**官方镜像 URL**
1. Pagurehttps://pagure.io/gfwlist/raw/master/f/gfwlist.txt
1. Repo.or.czhttp://repo.or.cz/gfwlist.git/blob_plain/HEAD:/gfwlist.txt
2. Repo.or.czhttp://repo.or.cz/gfwlist.git/blob_plain/HEAD:/gfwlist.txt
2. Bitbuckethttps://bitbucket.org/gfwlist/gfwlist/raw/HEAD/gfwlist.txt
3. Bitbuckethttps://bitbucket.org/gfwlist/gfwlist/raw/HEAD/gfwlist.txt
3. GitLabhttps://gitlab.com/gfwlist/gfwlist/raw/master/gfwlist.txt
4. Gitlabhttps://gitlab.com/gfwlist/gfwlist/raw/master/gfwlist.txt
5. TuxFamily https://git.tuxfamily.org/gfwlist/gfwlist.git/plain/gfwlist.txt
**镜像可以缓解 GitHub 上原始文件获取导致的问题,这可能违反 [GitHub ToS](https://github.com/site/terms)。**
## Stargazers
[![Stargazers over time](https://starchart.cc/gfwlist/gfwlist.svg?variant=adaptive)](https://starchart.cc/gfwlist/gfwlist)
[![随时间推移的 Stargazers](https://starchart.cc/gfwlist/gfwlist.svg)](https://starchart.cc/gfwlist/gfwlist)

@ -1 +0,0 @@
Subproject commit caf685e7eda2a54d85ae2b18c50aecff8b04f3b1

File diff suppressed because it is too large Load Diff

7573
list.txt

File diff suppressed because it is too large Load Diff