From df7d1478f112e44f393ae72ef148ed0c449d6442 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:37:20 +0200
Subject: [PATCH 1/8] Create main.yml
---
.github/workflows/main.yml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 .github/workflows/main.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..094e979
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,25 @@
+name: CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+ runs-on: windows-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Setup .NET Core
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '3.1.200'
+
+ - name: Clean
+ run: dotnet clean LibreHardwareMonitor.sln
+
+ - name: Build
+ run: dotnet build LibreHardwareMonitor.sln --configuration Release
From 565cf8354413f6c08e739bfd540ef2cfc2ca49d4 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:41:26 +0200
Subject: [PATCH 2/8] Update Aga.Controls.csproj
---
Aga.Controls/Aga.Controls.csproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Aga.Controls/Aga.Controls.csproj b/Aga.Controls/Aga.Controls.csproj
index ac10761..35affbb 100644
--- a/Aga.Controls/Aga.Controls.csproj
+++ b/Aga.Controls/Aga.Controls.csproj
@@ -42,6 +42,7 @@
false
false
true
+ true
@@ -261,4 +262,4 @@
-->
-
\ No newline at end of file
+
From b9cdd10d8e4b2a0f892390ed369d4263babfaa3e Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:47:40 +0200
Subject: [PATCH 3/8] Update Aga.Controls.csproj
---
Aga.Controls/Aga.Controls.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/Aga.Controls/Aga.Controls.csproj b/Aga.Controls/Aga.Controls.csproj
index 35affbb..1c40bcb 100644
--- a/Aga.Controls/Aga.Controls.csproj
+++ b/Aga.Controls/Aga.Controls.csproj
@@ -42,7 +42,6 @@
false
false
true
- true
From 021e8b796d26146479b725d542e2f730b983c1bb Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:52:28 +0200
Subject: [PATCH 4/8] Update main.yml
---
.github/workflows/main.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 094e979..6f44362 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,6 +9,7 @@ on:
jobs:
build:
runs-on: windows-latest
+ if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v2
@@ -17,9 +18,12 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.200'
-
+
+ - name: Add msbuild to PATH
+ uses: microsoft/setup-msbuild@v1.0.1
+
- name: Clean
- run: dotnet clean LibreHardwareMonitor.sln
+ run: msbuild LibreHardwareMonitor.sln -t:Clean
- name: Build
- run: dotnet build LibreHardwareMonitor.sln --configuration Release
+ run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release
From 4e847d59f6ff700a292c8ce2317583e76092a552 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:56:50 +0200
Subject: [PATCH 5/8] Update main.yml
---
.github/workflows/main.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f44362..bad35c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,6 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
+ - uses: nuget/setup-nuget@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
@@ -24,6 +25,9 @@ jobs:
- name: Clean
run: msbuild LibreHardwareMonitor.sln -t:Clean
+
+ - name: NuGet restore
+ run: nuget restore LibreHardwareMonitor.sln
- name: Build
run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release
From 79c72eee53ca4113d00cd3d457314208fe38a58c Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:59:31 +0200
Subject: [PATCH 6/8] Update main.yml
---
.github/workflows/main.yml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bad35c6..e889498 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,14 +14,12 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: nuget/setup-nuget@v1
+ - uses: microsoft/setup-msbuild@v1.0.1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: '3.1.200'
-
- - name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v1.0.1
+ dotnet-version: '3.1.200'
- name: Clean
run: msbuild LibreHardwareMonitor.sln -t:Clean
@@ -31,3 +29,9 @@ jobs:
- name: Build
run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: executables
+ path: |
+ bin/Release/
From 566d21596dfb437c0cc75e323a91ca90dd8f9d50 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 12:03:46 +0200
Subject: [PATCH 7/8] Update main.yml
---
.github/workflows/main.yml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e889498..a50387e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,12 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: nuget/setup-nuget@v1
- - uses: microsoft/setup-msbuild@v1.0.1
-
- - name: Setup .NET Core
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: '3.1.200'
+ - uses: microsoft/setup-msbuild@v1.0.1
- name: Clean
run: msbuild LibreHardwareMonitor.sln -t:Clean
@@ -28,10 +23,10 @@ jobs:
run: nuget restore LibreHardwareMonitor.sln
- name: Build
- run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release
+ run: msbuild LibreHardwareMonitor.sln -p:Configuration=Release -m
- uses: actions/upload-artifact@v2
with:
- name: executables
+ name: Binaries
path: |
bin/Release/
From e41b1013c12dafc49805bdb5d7273e75f656bb42 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Fri, 2 Oct 2020 12:06:18 +0200
Subject: [PATCH 8/8] Update main.yml
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a50387e..922ea95 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
- uses: microsoft/setup-msbuild@v1.0.1
- name: Clean
- run: msbuild LibreHardwareMonitor.sln -t:Clean
+ run: msbuild LibreHardwareMonitor.sln -t:Clean -m
- name: NuGet restore
run: nuget restore LibreHardwareMonitor.sln