From d37022c9f428fe23094254fda48f8978c70c01ba Mon Sep 17 00:00:00 2001 From: Rushi Ranpise <37355997+rushiranpise@users.noreply.github.com> Date: Tue, 4 Jul 2023 22:00:23 +0530 Subject: [PATCH] feat: build Win32 using Actions (#2) --- .github/workflows/win.yml | 33 +++++++++++++++++-- .../history/history_inner_widget.cpp | 2 +- .../view/history_view_context_menu.cpp | 2 +- .../SourceFiles/settings/settings_main.cpp | 2 +- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index a3f305ce4..257010128 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -1,6 +1,7 @@ name: Windows. on: + workflow_dispatch: push: paths-ignore: - 'docs/**' @@ -46,10 +47,10 @@ jobs: strategy: matrix: - arch: [Win32, x64] + arch: [Win32] env: - UPLOAD_ARTIFACT: "false" + UPLOAD_ARTIFACT: "true" ONLY_CACHE: "false" PREPARE_PATH: "Telegram/build/prepare/prepare.py" @@ -156,10 +157,36 @@ jobs: if: (env.UPLOAD_ARTIFACT == 'true') || ${{ github.ref == 'refs/heads/nightly' }} run: | mkdir artifact - move %TBUILD%\%REPO_NAME%\out\Debug\Telegram.exe artifact/ + move %TBUILD%\%REPO_NAME%\out\Debug\AyuGram.exe artifact/ - uses: actions/upload-artifact@master name: Upload artifact. if: (env.UPLOAD_ARTIFACT == 'true') || ${{ github.ref == 'refs/heads/nightly' }} with: name: ${{ env.ARTIFACT_NAME }} path: artifact\ + + release: + name: Release + needs: [windows] + runs-on: ubuntu-latest + strategy: + fail-fast: true + steps: + - uses: actions/checkout@v2 + + - name: Merge Releases + uses: actions/download-artifact@v2 + with: + name: Telegram_Win32 + path: artifact + + - name: Upload release + uses: Hs1r1us/Release-AIO@v1.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + # The name of the tag + tag_name: prelease-${{ github.run_number }} + prerelease: true + release_name: Ayugram CI + asset_files: './artifact' diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 7b5446689..a60dc62ab 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -106,7 +106,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#include "ayu/context_menu/context_menu.h" +#include "ayu/ui/context_menu/context_menu.h" #include "styles/style_ayu_icons.h" namespace { diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index c7a15671c..7dca2d0f0 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -75,7 +75,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ayu/ayu_settings.h" #include "ayu/database/ayu_database.h" -#include "ayu/context_menu/message_history_box.h" +#include "ayu/ui/context_menu/message_history_box.h" namespace HistoryView { namespace { diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index 42e13e589..ea579e853 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -68,7 +68,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#include "ayu/settings/settings_ayu.h" +#include "ayu/ui/settings/settings_ayu.h" namespace Settings { namespace {