Skip to content

Commit 97b0881

Browse files
committed
Merge dev into main: release 3.2.1
2 parents 3788b7c + 7fa2924 commit 97b0881

133 files changed

Lines changed: 9242 additions & 5490 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@ jobs:
284284
const fs = require('fs');
285285
const update = JSON.parse(fs.readFileSync('update.json', 'utf8'));
286286
287+
// Version comes from the git tag, not update.json — the file is kept
288+
// with version: "" between releases so clients on main don't see a
289+
// version bump before CI has published the artifacts.
290+
const version = (process.env.GITHUB_REF_NAME || '').replace(/^v/, '');
291+
287292
const pickLang = (v, lang) => {
288293
if (v == null) return '';
289294
if (typeof v === 'string') return v;
@@ -307,17 +312,17 @@ jobs:
307312
308313
const sections = [];
309314
if (ruNotes) {
310-
sections.push(`Что нового в версии ${update.version}?\n\n${ruNotes}\n\n🌐 Официальный сайт: ${host}`);
315+
sections.push(`Что нового в версии ${version}?\n\n${ruNotes}\n\n🌐 Официальный сайт: ${host}`);
311316
}
312317
if (enNotes && enNotes !== ruNotes) {
313-
sections.push(`What's new in version ${update.version}?\n\n${enNotes}\n\n🌐 Official website: ${host}`);
318+
sections.push(`What's new in version ${version}?\n\n${enNotes}\n\n🌐 Official website: ${host}`);
314319
}
315320
const releaseBody = sections.join('\n\n---\n\n');
316321
fs.writeFileSync('RELEASE_BODY.txt', releaseBody);
317322
318323
const releaseName = enTitle && enTitle !== ruTitle
319-
? `ResultV v${update.version} - ${ruTitle} / ${enTitle}`
320-
: `ResultV v${update.version} - ${ruTitle}`;
324+
? `ResultV v${version} - ${ruTitle} / ${enTitle}`
325+
: `ResultV v${version} - ${ruTitle}`;
321326
fs.appendFileSync(process.env.GITHUB_OUTPUT, `release_name=${releaseName}\n`);
322327
NODE_EOF
323328
node prepare_release.cjs

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ build/linux/libcronet.so
5555
tools/encrypt-sub/
5656
build-release.bat
5757
build-release.sh
58+
docs/review
5859

5960
# build
6061
build/bin/

README.en.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</p>
1111

1212
<p align="center">
13-
<img src="https://img.shields.io/badge/version-3.2.0-blue.svg" alt="Version">
13+
<img src="https://img.shields.io/badge/version-3.2.1-blue.svg" alt="Version">
1414
<img src="https://img.shields.io/badge/desktop-Wails-27272f.svg" alt="Wails">
1515
<img src="https://img.shields.io/badge/backend-Go-00ADD8.svg" alt="Go">
1616
<img src="https://img.shields.io/badge/frontend-React_18-61dafb.svg" alt="React">
@@ -29,11 +29,15 @@
2929
<a href="./README.md">Русский</a> | <b>English</b>
3030
</p>
3131

32+
<p align="center">
33+
<b>Website and downloads:</b> <a href="https://result-proxy.ru/">result-proxy.ru</a> • <b>Telegram channel:</b> <a href="https://t.me/resultvpn">@resultvpn</a>
34+
</p>
35+
3236
---
3337

3438
## Overview
3539

36-
ResultV **3.2.0** is a native desktop application built with **[Wails v2](https://wails.io/)**. The UI is **React 18** with **Vite** and **Tailwind CSS**; traffic is handled by a **Go** backend and **[sing-box](https://github.com/SagerNet/sing-box)** (with project-specific build tags in `wails.json`). The interface is localized with **i18next** (English and Russian).
40+
ResultV **3.2.1** is a native desktop application built with **[Wails v2](https://wails.io/)**. The UI is **React 18** with **Vite** and **Tailwind CSS**; traffic is handled by a **Go** backend and **[sing-box](https://github.com/SagerNet/sing-box)** (with project-specific build tags in `wails.json`). The interface is localized with **i18next** (English and Russian).
3741

3842
**Prebuilt releases:** GitHub Actions publishes **Windows amd64** artifacts (portable `.exe` and NSIS installer), **macOS** (`.dmg`) and **Linux** (`.AppImage`, `.deb`, `.rpm`) when a `v*` tag is pushed.
3943

@@ -207,7 +211,3 @@ The [`.github/workflows/release.yml`](./.github/workflows/release.yml) workflow
207211
## License
208212

209213
This project is licensed under the **GNU General Public License v3.0** — see [`LICENSE`](./LICENSE).
210-
211-
---
212-
213-
**Website and downloads:** [https://result-proxy.ru/](https://result-proxy.ru/)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</p>
1111

1212
<p align="center">
13-
<img src="https://img.shields.io/badge/version-3.2.0-blue.svg" alt="Version">
13+
<img src="https://img.shields.io/badge/version-3.2.1-blue.svg" alt="Version">
1414
<img src="https://img.shields.io/badge/desktop-Wails-27272f.svg" alt="Wails">
1515
<img src="https://img.shields.io/badge/backend-Go-00ADD8.svg" alt="Go">
1616
<img src="https://img.shields.io/badge/frontend-React_18-61dafb.svg" alt="React">
@@ -29,11 +29,15 @@
2929
<b>Русский</b> | <a href="./README.en.md">English</a>
3030
</p>
3131

32+
<p align="center">
33+
<b>Сайт и загрузки:</b> <a href="https://result-proxy.ru/">result-proxy.ru</a> • <b>Telegram-канал:</b> <a href="https://t.me/resultvpn">@resultvpn</a>
34+
</p>
35+
3236
---
3337

3438
## О проекте
3539

36-
ResultV **3.2.0** — нативное настольное приложение на **[Wails v2](https://wails.io/)**. Интерфейс: **React 18**, **Vite**, **Tailwind CSS**; трафик обрабатывает бэкенд на **Go** и движок **[sing-box](https://github.com/SagerNet/sing-box)** (теги сборки заданы в `wails.json`). Локализация через **i18next** (русский и английский).
40+
ResultV **3.2.1** — нативное настольное приложение на **[Wails v2](https://wails.io/)**. Интерфейс: **React 18**, **Vite**, **Tailwind CSS**; трафик обрабатывает бэкенд на **Go** и движок **[sing-box](https://github.com/SagerNet/sing-box)** (теги сборки заданы в `wails.json`). Локализация через **i18next** (русский и английский).
3741

3842
**Готовые сборки:** в GitHub Actions публикуются артефакты **Windows amd64** (portable `.exe` и установщик NSIS), **macOS** (`.dmg`) и **Linux** (`.AppImage`, `.deb`, `.rpm`) при push тега `v`*.
3943

@@ -220,7 +224,3 @@ wails build -nsis
220224
## Лицензия
221225

222226
Проект распространяется под **GNU General Public License v3.0** — см. `[LICENSE](./LICENSE)`.
223-
224-
---
225-
226-
**Сайт и загрузки:** [https://result-proxy.ru/](https://result-proxy.ru/)

THIRD_PARTY_LICENSES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ Key dependency licenses:
3939
| github.com/wailsapp/wails | MIT |
4040
| golang.org/x/sys | BSD-3-Clause |
4141
| github.com/getlantern/golog | Apache-2.0 |
42+
| github.com/AdguardTeam/urlfilter | GPL-3.0 |
43+
| github.com/AdguardTeam/gomitmproxy | MIT |
44+
| github.com/AdguardTeam/golibs | Apache-2.0 |

0 commit comments

Comments
 (0)