Skip to content

Commit e0048a3

Browse files
authored
Merge pull request #230 from p2pquake/feature/tag-release
Automatic release build
2 parents 1370921 + 0a612fa commit e0048a3

File tree

6 files changed

+72
-6
lines changed

6 files changed

+72
-6
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: dotnet publish
2+
3+
on:
4+
push:
5+
tags:
6+
- v*
7+
8+
# See: https://docs.microsoft.com/ja-jp/dotnet/devops/dotnet-test-github-action
9+
# https://docs.microsoft.com/ja-jp/aspnet/core/host-and-deploy/visual-studio-publish-profiles?view=aspnetcore-5.0#folder-publish-example
10+
jobs:
11+
build:
12+
runs-on: windows-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Setup .NET 5.0
16+
uses: actions/setup-dotnet@v1
17+
with:
18+
dotnet-version: "5.0.x"
19+
- name: Publish AutoUpdater
20+
run: dotnet publish .\AutoUpdater\AutoUpdater.csproj /p:Configuration=Release /p:PublishProfile=FolderProfile
21+
- name: Publish WpfClient
22+
run: dotnet publish .\WpfClient\WpfClient.csproj /p:Configuration=Release /p:PublishProfile=FolderProfile
23+
- name: Collect package files
24+
run: |
25+
powershell Copy-Item -Path .\AutoUpdater\bin\Release\net5.0-windows\publish\P2PQuakeAutoUpdater.exe -Destination .\WpfClient\bin\Release\net5.0-windows10.0.18362.0\publish\
26+
- name: Package
27+
run: |
28+
powershell Move-Item .\WpfClient\bin\Release\net5.0-windows10.0.18362.0\publish .\P2PQuake_${{ github.ref_name }}; Compress-Archive -Path .\P2PQuake_${{ github.ref_name }} -DestinationPath .\P2PQuake_${{ github.ref_name }}.zip
29+
- name: Release
30+
uses: softprops/action-gh-release@v1
31+
with:
32+
files: P2PQuake_${{ github.ref_name }}.zip

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ publish/
143143
*.azurePubxml
144144
# TODO: Comment the next line if you want to checkin your web deploy settings
145145
# but database connection strings (with potential passwords) will be unencrypted
146-
*.pubxml
146+
#*.pubxml
147147
*.publishproj
148148

149149
# Microsoft Azure Web App publish settings. Comment the next line if you want to
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<Configuration>Release</Configuration>
8+
<Platform>Any CPU</Platform>
9+
<PublishDir>bin\Release\net5.0-windows\publish\</PublishDir>
10+
<PublishProtocol>FileSystem</PublishProtocol>
11+
<TargetFramework>net5.0-windows</TargetFramework>
12+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
13+
<SelfContained>false</SelfContained>
14+
<PublishSingleFile>True</PublishSingleFile>
15+
<PublishReadyToRun>False</PublishReadyToRun>
16+
</PropertyGroup>
17+
</Project>

AutoUpdater/Updater/UpdateClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public static async Task<UpdateResult> Update(UpdateEntry[] entries)
6161

6262
foreach (var entry in entries)
6363
{
64-
// 自分自身が更新対象の場合、 AutoUpdater2.exe として退避する
64+
// 自分自身が更新対象の場合、 P2PQuakeAutoUpdater2.exe として退避する
6565
// (あとで P2PQuake (WpfClient) によって差し替えられる)
66-
if (entry.path == "AutoUpdater.exe")
66+
if (entry.path == "P2PQuakeAutoUpdater.exe")
6767
{
68-
entry.path = "AutoUpdater2.exe";
68+
entry.path = "P2PQuakeAutoUpdater2.exe";
6969
}
7070

7171
var response = await Client.GetStreamAsync($"{UpdateUri}/{entry.path}");
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<Configuration>Release</Configuration>
8+
<Platform>Any CPU</Platform>
9+
<PublishDir>bin\Release\net5.0-windows10.0.18362.0\publish\</PublishDir>
10+
<PublishProtocol>FileSystem</PublishProtocol>
11+
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
12+
<SelfContained>false</SelfContained>
13+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
14+
<PublishSingleFile>True</PublishSingleFile>
15+
<PublishReadyToRun>False</PublishReadyToRun>
16+
</PropertyGroup>
17+
</Project>

WpfClient/Updater.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace WpfClient
1212
{
1313
public static class Updater
1414
{
15-
private static readonly string updaterFilename = "AutoUpdater.exe";
16-
private static readonly string updaterSourceFilename = "AutoUpdater2.exe";
15+
private static readonly string updaterFilename = "P2PQuakeAutoUpdater.exe";
16+
private static readonly string updaterSourceFilename = "P2PQuakeAutoUpdater2.exe";
1717

1818
public static void Run()
1919
{

0 commit comments

Comments
 (0)