Skip to content

Commit

Permalink
Merge pull request #55 from SkyHighR/main
Browse files Browse the repository at this point in the history
feat: Add GitHub Actions workflow for upstream sync
  • Loading branch information
NekoMirra authored Oct 25, 2024
2 parents 7e10288 + 2a685b0 commit 8e45773
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 11 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Upstream Sync"

on:
schedule:
- cron: "0 0 * * *" # 每天同步一次
workflow_dispatch:

jobs:
sync_latest_from_upstream:
runs-on: ubuntu-latest
name: Sync latest commits from upstream repo

steps:
- name: Checkout target repo
uses: actions/checkout@v3

- name: Sync upstream changes
id: sync
uses: aormsby/[email protected]
with:
upstream_sync_repo: Ac-Wiki/AcWiKi
upstream_sync_branch: main
target_sync_repo: Ac-Wiki/AcWiKi
target_sync_branch: main
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
test_mode: false
10 changes: 5 additions & 5 deletions 01-student-discounts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
> [!TIP]
>
> <details>
> <summary>GitHub学生包申请注意事项</summary>
>
> - 尽量使用edu邮箱进行申请
> <summary>GitHub 学生包申请注意事项</summary>
>
> - 尽量使用 edu 邮箱进行申请
> - 申请过程中会定位,请尽可能在学校位置
> - 上传证件可上传学信网验证报告(翻译件)
> - 上传证件可上传学信网验证报告 (翻译件)
> - 多试几次
> </details>
Expand All @@ -55,7 +55,7 @@

## 📑办公

- [Microsoft 365 个人版](https://www.microsoft.com/zh-cn/microsoft-365/college-student-pricing):著名办公套件,包含1T的OneDrive空间。学生计划¥18/月(原计划¥39/月)
- [Microsoft 365 个人版](https://www.microsoft.com/zh-cn/microsoft-365/college-student-pricing):著名办公套件,包含 1T 的 OneDrive 空间。学生计划¥18/月 (原计划¥39/月)

## 🎨设计

Expand Down
21 changes: 17 additions & 4 deletions 03-tools/Android/加密通讯.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

Telegram 是最广为认知的端到端加密聊天通讯软件,部分开发的源代码促进其生态的繁荣

- [Telegram官方下载](https://t.me)
- **Telegram X**(==推荐==,仅Android
- [Telegram 官方下载](https://t.me)
- **Telegram X**(==推荐==,仅 Android
- [Telegram X](https://github.com/TGX-Android/Telegram-X/releases/tag/v0.26.9.1730)

<!--
Expand All @@ -37,50 +37,63 @@ Telegram X PIC
PS:真的很繁荣,还有众多第三方构建的版本

- Nekogram(Android)

- [Nekogram](https://github.com/Nekogram/Nekogram/releases)

- NULLgram(Android)

- [Nullgram](https://github.com/qwq233/Nullgram/releases)

- Nagram(Android)

- [Nagram](https://github.com/NextAlone/Nagram/releases)

- Forkgram

- [Forkgram](https://github.com/forkgram/TelegramAndroid/releases)

- Cherrygram(Android)

- [Cherrygram](https://github.com/arsLan4k1390/Cherrygram/releases)

- Mercurygram

- [Mercurygram](https://github.com/Mercurygram/Mercurygram/releases)

- MDgram(Android)

- [MDgram](https://mdgram.dev/download-mdgram/)

- Swiftgram(iOS)

- [Swiftgram](https://github.com/Swiftgram/Telegram-iOS)

- Turrit(Android/iOS)

- [Turrit](https://iturrit.com/zh/)

- Nicegram(Android、iOS、MacOS)

- [Nicegram](https://nicegram.app/)

- Unigram(Windows)

- [Unigram](https://github.com/UnigramDev/Unigram)

- materialgram(Windows)

- [materialgram](https://github.com/kukuruzka165/materialgram/releases)

- 64gram(Windows、Linux、MacOS )

- [64gram](https://github.com/TDesktop-x64/tdesktop/releases)

- iMe MessengerWindowsLinuxMacOSAndroidiOS
- iMe Messenger (Windows, Linux, MacOS, Android, iOS)
- [iMe Messenger](https://www.imem.app/)

等等众多第三方 telegram 客户端

<!--
<!--
- **Forkgram**
- Telegram 官方程序分支,因此得名 Forkgram,拥有更多功能。
Expand Down
2 changes: 1 addition & 1 deletion 05-common-sense-of-life/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@

**事关健康,常识类知识仅供参考。如有不适,及时就医!少百度!!**

- [默沙东诊疗手册](https://www.msdmanuals.cn):全球最权威的医学参考书之一,面向各界用户提供全面专业的医疗信息。
- [默沙东诊疗手册](https://www.msdmanuals.cn):全球最权威的医学参考书之一面向各界用户提供全面专业的医疗信息。

# 潮流美装
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@

### 贡献/参与者

感谢所有参与到开发/测试中的朋友们,是大家的帮助让 AcWiKi 越来越好! (\*´▽`)ノノ
感谢所有参与到开发/测试中的朋友们,是大家的帮助让 AcWiKi 越来越好! (\*´▽`) ノノ

[![Contributors](https://contributors-img.web.app/image?repo=Ac-Wiki/AcWiKi&max=105&columns=15)](https://github.com/Ac-Wiki/AcWiKi/graphs/contributors)

0 comments on commit 8e45773

Please sign in to comment.