Skip to content

Commit

Permalink
FIx userlist creation
Browse files Browse the repository at this point in the history
Update workflows
  • Loading branch information
Virenbar committed Jan 22, 2022
1 parent 16067f1 commit 06660cb
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
name: .NET Core Desktop
name: Build Artifact

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

workflow_call:
outputs:
version:
description: "Version builded"
value: ${{ jobs.build.outputs.version }}
jobs:
build:
strategy:
matrix:
configuration: [Debug, Release]
runs-on: windows-latest
env:
Solution_Name: GDPIControl.sln
DOTNET_NOLOGO: true
SolutionName: GDPIControl.sln
Configuration: ${{ matrix.configuration }}

outputs:
version: ${{steps.version.outputs.version}}
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -31,19 +37,20 @@ jobs:
uses: microsoft/[email protected]

- name: Set VERSION
shell: pwsh
id: version
run: |
dotnet tool install -g minver-cli --version 2.5.0
$version = minver -t v -d preview
$number = $version.Split('-')[0]
echo "GITHUB_ENV: VERSION=$version"
echo "VERSION=$version"
echo "VERSION=$version" >> $GITHUB_ENV
echo "::set-output name=version::$version"
- name: Restore solution
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
run: msbuild $env:SolutionName /t:Restore /p:Configuration=$env:Configuration

- name: Build solutin
run: msbuild $env:Solution_Name /t:Build /p:Configuration=$env:Configuration
run: msbuild $env:SolutionName /t:Build /p:Configuration=$env:Configuration

- name: Upload a Build Artifact
if: matrix.configuration == 'Release'
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Build Release

on:
push:
tags:
- "v*.*.*"

jobs:
build:
uses: Virenbar/GDPIControl/.github/workflows/build-artifact.yml@master
release:
runs-on: windows-latest
needs: build
steps:
- run: echo Version builded ${{ needs.build.outputs.version }}

2 changes: 1 addition & 1 deletion GDPIControl/FormMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private void MI_Blacklist_Click(object sender, EventArgs e)

private void MI_Userlist_Click(object sender, EventArgs e)
{
if (!File.Exists(Constants.UserlistPath)) { File.Create(Constants.UserlistPath); }
if (!File.Exists(Constants.UserlistPath)) { File.WriteAllText("", Constants.UserlistPath); }
Process.Start(new ProcessStartInfo(Constants.UserlistPath) { UseShellExecute = true });
}

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# GDPIControl - GoodbyeDPI Tray Control
Small tray application for controlling GoodbyeDPI

- **[WinDivert](https://github.com/basil00/Divert)** by @basil00
- **[GoodbyeDPI](https://github.com/ValdikSS/GoodbyeDPI/)** by @ValdikSS
- **[WinDivert](https://github.com/basil00/Divert)** by @basil00
- **[GoodbyeDPI](https://github.com/ValdikSS/GoodbyeDPI/)** by @ValdikSS

0 comments on commit 06660cb

Please sign in to comment.