From 04acbdc221a75f94d38ec4f80a3f826117443466 Mon Sep 17 00:00:00 2001 From: DjLegolas Date: Mon, 13 Apr 2020 17:14:42 +0300 Subject: Update github workflows --- .github/workflows/ubuntu-build.yml | 2 +- .github/workflows/windows-build.yml | 74 +++++++++++++++++++++++++++++++++++++ win32/installer/hexchat.iss.tt | 4 +- 3 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/windows-build.yml diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml index c3bafadc..f2d3ac8e 100644 --- a/.github/workflows/ubuntu-build.yml +++ b/.github/workflows/ubuntu-build.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml new file mode 100644 index 00000000..82b5bcec --- /dev/null +++ b/.github/workflows/windows-build.yml @@ -0,0 +1,74 @@ +name: Windows Build +on: [push, pull_request] + +jobs: + build: + runs-on: windows-2019 + strategy: + matrix: + platform: [x64, win32] + arch: [x64, x86] + exclude: + - platform: x64 + arch: x86 + - platform: win32 + arch: x64 + fail-fast: false + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 1 + + - name: Install Dependencies + run: | + New-Item -Name "deps" -ItemType "Directory" + + Invoke-WebRequest http://files.jrsoftware.org/is/5/innosetup-5.5.9-unicode.exe -OutFile deps\innosetup-unicode.exe + & deps\innosetup-unicode.exe /VERYSILENT | Out-Null + + Invoke-WebRequest https://bitbucket.org/mitrich_k/inno-download-plugin/downloads/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe + & deps\idpsetup.exe /VERYSILENT + + Invoke-WebRequest https://dl.hexchat.net/gtk/gtk-${{ matrix.platform }}-2018-08-29.7z -OutFile deps\gtk-${{ matrix.arch }}.7z + & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk + + Invoke-WebRequest https://dl.hexchat.net/gtk-win32/gendef-20111031.7z -OutFile deps\gendef.7z + & 7z.exe x deps\gendef.7z -oC:\gtk-build + + Invoke-WebRequest https://dl.hexchat.net/gtk-win32/WinSparkle-20151011.7z -OutFile deps\WinSparkle.7z + & 7z.exe x deps\WinSparkle.7z -oC:\gtk-build\WinSparkle + + Invoke-WebRequest https://dl.hexchat.net/misc/perl/perl-5.20.0-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z + & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }} + + New-Item -Path "c:\gtk-build" -Name "python-2.7" -ItemType "Directory" + New-Item -Path "c:\gtk-build" -Name "python-3.6" -ItemType "Directory" + New-Item -Path "c:\gtk-build\python-2.7" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/2.7.17/${{ matrix.arch }}" + New-Item -Path "c:\gtk-build\python-3.6" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}" + + C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}/python.exe -m pip install cffi + C:/hostedtoolcache/windows/Python/2.7.17/${{ matrix.arch }}/python.exe -m pip install -qq cffi + shell: powershell + + - name: Build + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + msbuild win32\hexchat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }} + shell: cmd + + - name: Preparing Artifacts + run: | + move ..\hexchat-build\${{ matrix.platform }}\HexChat*.exe .\ + move ..\hexchat-build .\ + shell: cmd + + - uses: actions/upload-artifact@v2-preview + with: + name: Installer + path: HexChat*.exe + + - uses: actions/upload-artifact@v2-preview + with: + name: Build + path: hexchat-build diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 3ac5ec41..be985384 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -31,9 +31,9 @@ Compression=lzma2/ultra64 SourceDir=..\rel OutputDir=.. #if APPARCH == "x64" -OutputBaseFilename={#APPNAM} {#APPVER} x64 +OutputBaseFilename={#APPNAM}-{#APPVER}_x64 #else -OutputBaseFilename={#APPNAM} {#APPVER} x86 +OutputBaseFilename={#APPNAM}-{#APPVER}_x86 #endif FlatComponentsList=no PrivilegesRequired=none -- cgit 1.4.1