Skip to content

Commit e7dfadf

Browse files
DHR60DHR60
committed
chore
1 parent a35e829 commit e7dfadf

File tree

7 files changed

+25
-17
lines changed

7 files changed

+25
-17
lines changed

‎.github/workflows/build-qv2ray-qt6.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
if: matrix.os == 'windows-latest'
8282
run: |
8383
cd ./libs
84-
./setup-libs.sh windows x64
84+
./setup-libs.sh windows x64 ${{ secrets.GITHUB_TOKEN }}
8585
# ========================================================================================================= Generate MakeFile and Build
8686

8787
- uses: actions/setup-node@v3
@@ -199,10 +199,9 @@ jobs:
199199
# --------------------------------------------------------
200200
- name: Win - ${{ matrix.qt_version }} - Create 7z Release
201201
if: matrix.os == 'windows-latest'
202-
uses: DuckSoft/create-7z-action@v1.0
202+
uses: edgarrc/action-7z@v1
203203
with:
204-
pathSource: ./build/deployment/
205-
pathTarget: ./release.7z
204+
args: 7z a -t7z -mx=5 release.7z ./build/deployment
206205
- name: Win - ${{ matrix.qt_version }} - Uploading Artifact
207206
if: matrix.os == 'windows-latest'
208207
uses: actions/upload-artifact@master
@@ -221,10 +220,9 @@ jobs:
221220
# --------------------------------------------------------
222221
- name: Linux - ${{ matrix.qt_version }} - Create 7z Release
223222
if: matrix.os == 'ubuntu-24.04'
224-
uses: DuckSoft/create-7z-action@v1.0
223+
uses: edgarrc/action-7z@v1
225224
with:
226-
pathSource: ./build/
227-
pathTarget: ./release.7z
225+
args: 7z a -t7z -mx=5 release.7z ./build/AppDir/usr
228226
- name: Linux - ${{ matrix.qt_version }} - Uploading Artifact
229227
if: matrix.os == 'ubuntu-24.04'
230228
uses: actions/upload-artifact@master

‎assets/qv2ray.metainfo.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
</release>
4646
</releases>
4747
<content_rating type="oars-1.1" />
48-
<url type="homepage">https://github.com/Qv2ray/Qv2ray</url>
49-
<url type="bugtracker">https://github.com/Qv2ray/Qv2ray/issues</url>
48+
<url type="homepage">https://github.com/DHR60/Qv2ray</url>
49+
<url type="bugtracker">https://github.com/DHR60/Qv2ray/issues</url>
5050
</component>

‎cmake/deployment.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if(WIN32)
3030
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"DisplayIcon\\\" \\\"$INSTDIR\\\\qv2ray.exe\\\"
3131
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"HelpLink\\\" \\\"https://qv2ray.net\\\"
3232
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"InstallLocation\\\" \\\"$INSTDIR\\\"
33-
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"URLUpdateInfo\\\" \\\"https://github.com/Qv2ray/Qv2ray/releases\\\"
34-
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"URLInfoAbout\\\" \\\"https://github.com/Qv2ray/Qv2ray\\\"
33+
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"URLUpdateInfo\\\" \\\"https://github.com/DHR60/Qv2ray/releases\\\"
34+
WriteRegStr HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\qv2ray\\\" \\\"URLInfoAbout\\\" \\\"https://github.com/DHR60/Qv2ray\\\"
3535
")
3636
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
3737
ExecWait \\\"taskkill /f /im qv2ray.exe\\\"

‎libs/setup-libs.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,14 @@ download_with_retry() {
2828
get_json_with_retry() {
2929
local url="$1"
3030
local retry=0
31+
local auth_header=""
32+
33+
if [ -n "$GITHUB_TOKEN" ]; then
34+
auth_header="-H \"Authorization: token $GITHUB_TOKEN\""
35+
fi
3136

3237
while true; do
33-
local json=$(curl -s "$url" | jq ".assets[] | {browser_download_url, name}" -c | grep "$DEPS_CATEGORY-$DEPS_OS")
38+
local json=$(curl -s $auth_header "$url" | jq ".assets[] | {browser_download_url, name}" -c | grep "$DEPS_CATEGORY-$DEPS_OS")
3439
if [ -n "$json" ]; then
3540
echo "$json"
3641
return 0
@@ -52,8 +57,13 @@ mkdir -p downloaded; cd ./downloaded;
5257

5358
DEPS_OS=$1
5459
DEPS_CATEGORY=$2
60+
GITHUB_TOKEN=$3
61+
62+
if [ -n "$GITHUB_TOKEN" ]; then
63+
echo "Using provided GitHub token for API requests"
64+
fi
5565

56-
_JSON=$(get_json_with_retry "https://api.github.com/repos/Qv2ray/Qv2ray-deps/releases/latest")
66+
_JSON=$(get_json_with_retry "https://api.github.com/repos/DHR60/Qv2ray-deps/releases/latest")
5767

5868
if [ $? -ne 0 ]; then
5969
exit 1

‎packaging/rpm/qv2ray.spec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ URL: https://qv2ray.net/
99

1010
# Source0 is created by:
1111
# pip install git-archive-all
12-
# git clone https://github.com/Qv2ray/Qv2ray.git
12+
# git clone https://github.com/DHR60/Qv2ray.git
1313
# cd Qv2ray
1414
# git archive-all --force-submodules ../@SOURCE0@
1515
Source0: @SOURCE0@

‎src/components/update/UpdateChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
const inline QMap<int, QString> UpdateChannelLink //
1010
{
11-
{0, "https://api.github.com/repos/Qv2ray/Qv2ray/releases/latest" }, //
12-
{ 1, "https://api.github.com/repos/Qv2ray/Qv2ray/releases?per_page=1"} //
11+
{0, "https://api.github.com/repos/DHR60/Qv2ray/releases/latest" }, //
12+
{ 1, "https://api.github.com/repos/DHR60/Qv2ray/releases?per_page=1"} //
1313
};
1414
#define QV_MODULE_NAME "Update"
1515

‎src/ui/widgets/windows/w_PreferencesWindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ Custom DNS Settings</string>
22042204
</sizepolicy>
22052205
</property>
22062206
<property name="text">
2207-
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a style=&quot; text-decoration: none; color:#2980b9;&quot; href=&quot;https://github.com/Qv2ray/Qv2ray&quot;&gt;https://github.com/Qv2ray/Qv2ray&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
2207+
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a style=&quot; text-decoration: none; color:#2980b9;&quot; href=&quot;https://github.com/DHR60/Qv2ray&quot;&gt;https://github.com/DHR60/Qv2ray&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
22082208
</property>
22092209
<property name="textFormat">
22102210
<enum>Qt::TextFormat::RichText</enum>

0 commit comments

Comments
 (0)