Skip to content

Commit

Permalink
Merge pull request #22 from hass-agent/development
Browse files Browse the repository at this point in the history
Release: 2.0.0 fixes and additional changes
  • Loading branch information
amadeo-alex authored Dec 23, 2023
2 parents 2ed7304 + de179f5 commit 223e413
Show file tree
Hide file tree
Showing 123 changed files with 2,773 additions and 1,866 deletions.
221 changes: 221 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
# built on .NET Core.
# To learn how to migrate your existing application to .NET Core,
# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
#
# To configure this workflow:
#
# 1. Configure environment variables
# GitHub sets default environment variables for every workflow run.
# Replace the variables relative to your project in the "env" section below.
#
# 2. Signing
# Generate a signing certificate in the Windows Application
# Packaging Project or add an existing signing certificate to the project.
# Next, use PowerShell to encode the .pfx file using Base64 encoding
# by running the following Powershell script to generate the output string:
#
# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
#
# Open the output file, SigningCertificate_Encoded.txt, and copy the
# string inside. Then, add the string to the repo as a GitHub secret
# and name it "Base64_Encoded_Pfx."
# For more information on how to configure your signing certificate for
# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
#
# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
# See "Build the Windows Application Packaging project" below to see how the secret is used.
#
# For more information on GitHub Actions, refer to https://github.com/features/actions
# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
# refer to https://github.com/microsoft/github-actions-for-desktop-apps

name: Create Release Draft

on:
workflow_dispatch:
inputs:
sourcebranch:
description: 'Source branch'
required: true
default: 'main'
releasetitle:
description: 'Release name'
required: true
releasetag:
description: "Release tag"
required: true
prerelease:
description: 'Is this a pre-release?'
required: true
default: 'true'
#push:
# branches: [ "main" ]
# tags:
# - '*'
#pull_request:
# branches: [ "main" ]

jobs:
build:
environment: TestEnv
strategy:
matrix:
#configuration: [Debug, Release]
configuration: [Release]

runs-on: windows-latest # For a list of available runner types, refer to
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on

env:
Solution_Name: src/HASS.Agent.sln # Replace with your solution name, i.e. MyWpfApp.sln.
#Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
#Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
#Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.

steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.sourcebranch }}

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
#- name: Setup MSBuild.exe
# uses: microsoft/setup-msbuild@v1.3.1

# Execute all unit tests in the solution
#- name: Execute unit tests
# run: dotnet test

# Restore the application to populate the obj folder with RuntimeIdentifiers
#- name: Restore the Nuget Packages
# run: |
# nuget restore src/HASS.Agent.sln
# msbuild src/HASS.Agent.sln #/t:Restore /p:Configuration=$env:Configuration
#env:
# Configuration: ${{ matrix.configuration }}

- name: Restore / Install dependencies
run: |
dotnet restore "src\\HASS.Agent\\HASS.Agent\\HASS.Agent.csproj"
dotnet restore "src\\HASS.Agent\\HASS.Agent.Satellite.Service\\HASS.Agent.Satellite.Service.csproj"
- name: Build & Publish HASS.Agent
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent\\HASS.Agent"
run: "dotnet publish -c Release -f net6.0-windows10.0.19041.0 -o bin\\Publish-x64\\Release\\ --no-self-contained -r win-x64 -p:Platform=x64"

- name: Build & Publish HASS.Agent.Satellite.Service
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent\\HASS.Agent.Satellite.Service"
run: "dotnet publish -c Release -f net6.0-windows10.0.19041.0 -o bin\\Publish-x64\\Release\\ --no-self-contained -r win-x64 -p:Platform=x64"

- name: Compile InnoSetup Installer
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent.Installer"
run: |
& "${Env:ProgramFiles(x86)}\\Inno Setup 6\\iscc.exe" InstallerScript.iss
- name: Decode the pfx
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent.Installer"
run: |
$pfxBytes = [System.Convert]::FromBase64String("${{ secrets.BASE64_ENCODED_PFX }}")
$certificatePath = [IO.Path]::GetFullPath(".\\HASS.Agent.Installer.pfx")
[IO.File]::WriteAllBytes($certificatePath, $pfxBytes)
- name: Sign the installer
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent.Installer"
run: |
$certificatePassword = ConvertTo-SecureString "${{ secrets.BASE64_ENCODED_PFX_PASSWORD }}" -AsPlainText -Force
$certificate = Get-PfxCertificate -FilePath ".\\HASS.Agent.Installer.pfx" -Password $certificatePassword
Set-AuthenticodeSignature -FilePath ".\\bin\\HASS.Agent.Installer.exe" -Certificate $certificate -HashAlgorithm SHA256 -TimestampServer http://timestamp.digicert.com
- name: Remove the pfx
working-directory: "D:\\a\\HASS.Agent\\HASS.Agent\\src\\HASS.Agent.Installer"
run: Remove-Item -path ".\\HASS.Agent.Installer.pfx"

#Upload project artifacts: https://github.com/marketplace/actions/upload-a-build-artifact
- name: Upload build artifacts (HASS Agent)
uses: actions/upload-artifact@v3
with:
name: HASS.Agent
path: "src\\HASS.Agent\\HASS.Agent\\bin\\Publish-x64\\Release"

- name: Upload build artifacts (HASS Agent Satellite Service)
uses: actions/upload-artifact@v3
with:
name: HASS.Agent.Satellite.Service
path: "src\\HASS.Agent\\HASS.Agent.Satellite.Service\\bin\\Publish-x64\\Release"

- name: Upload build artifacts (HASS Agent Installer)
uses: actions/upload-artifact@v3
with:
name: HASS.Agent.Installer
path: "src\\HASS.Agent.Installer\\bin\\HASS.Agent.Installer.exe"

#- name: Debugging artifact paths
# run: |
# Set-Location src\HASS.Agent
# Get-Childitem

#draft a release, https://github.com/actions/create-release
publish:
runs-on: ubuntu-latest
needs: [build]
permissions:
contents: write
steps:
- name: Create directories for Build Artifacts to download
run: |
mkdir HASS.Agent
mkdir HASS.Agent.Satellite.Service
mkdir HASS.Agent.Installer
ls -la
- name: Download Build Artifacts (HASS Agent)
uses: actions/download-artifact@v3.0.2
with:
name: HASS.Agent
path: HASS.Agent

- name: Download Build Artifacts (HASS Agent Satellite Service)
uses: actions/download-artifact@v3.0.2
with:
name: HASS.Agent.Satellite.Service
path: HASS.Agent.Satellite.Service

- name: Download Build Artifacts (HASS Agent Installer)
uses: actions/download-artifact@v3.0.2
with:
name: HASS.Agent.Installer
path: HASS.Agent.Installer


- name: Compress HASS Agent directories for manual install
run: |
cd HASS.Agent
ls -la
zip -r HASS.Agent.zip ./
cd ../
cd HASS.Agent.Satellite.Service
ls -la
zip -r HASS.Agent.Satellite.Service.zip ./
- name: Create Draft Release and Upload Build Artifacts
uses: ncipollo/release-action@v1.10.0
with:
name: ${{ github.event.inputs.releasetitle }}
draft: true
prerelease: ${{ github.event.inputs.prerelease }}
tag: ${{ github.event.inputs.releasetag }}
artifacts:
HASS.Agent/HASS.Agent.zip,HASS.Agent.Satellite.Service/HASS.Agent.Satellite.Service.zip,HASS.Agent.Installer/HASS.Agent.Installer.exe
10 changes: 5 additions & 5 deletions src/HASS.Agent.Installer/InstallerScript.iss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ InfoAfterFile=.\AfterInstallNotice.rtf
;PrivilegesRequired=lowest
OutputDir=.\bin
OutputBaseFilename=HASS.Agent.Installer
SetupIconFile=..\HASS.Agent.Staging\HASS.Agent.Shared\hassagent.ico
SetupIconFile=..\HASS.Agent\HASS.Agent.Shared\hassagent.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
Expand All @@ -57,12 +57,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Files]
; Client files
;Source: "..\HASS.Agent.Staging\HASS.Agent\bin\Publish-x64\Release\*"; Excludes: "*.pdb"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
;Source: "..\HASS.Agent\HASS.Agent\bin\Publish-x64\Release\*"; Excludes: "*.pdb"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; Service files
;Source: "..\HASS.Agent.Staging\HASS.Agent.Satellite.Service\bin\Publish-x64\Release\*"; Excludes: "*.pdb"; DestDir: "{commonpf64}\{#MyAppName}\Service"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\HASS.Agent.Staging\HASS.Agent\bin\Publish-x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
;Source: "..\HASS.Agent\HASS.Agent.Satellite.Service\bin\Publish-x64\Release\*"; Excludes: "*.pdb"; DestDir: "{commonpf64}\{#MyAppName}\Service"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\HASS.Agent\HASS.Agent\bin\Publish-x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; Service files
Source: "..\HASS.Agent.Staging\HASS.Agent.Satellite.Service\bin\Publish-x64\Release\*"; DestDir: "{commonpf64}\{#MyAppName}\Service"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\HASS.Agent\HASS.Agent.Satellite.Service\bin\Publish-x64\Release\*"; DestDir: "{commonpf64}\{#MyAppName}\Service"; Flags: ignoreversion recursesubdirs createallsubdirs

[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,30 @@ internal static async Task<bool> StoreAsync(List<ConfiguredCommand> commands, Li
{
foreach (var abstractCommand in toBeDeletedCommands.Select(StoredCommands.ConvertConfiguredToAbstract))
{
if (abstractCommand == null) continue;
if (abstractCommand == null)
continue;

// remove and unregister
await abstractCommand.UnPublishAutoDiscoveryConfigAsync();
await Variables.MqttManager.UnsubscribeAsync(abstractCommand);
Variables.Commands.RemoveAt(Variables.Commands.FindIndex(x => x.Id == abstractCommand.Id));
var commandIndex = Variables.Commands.FindIndex(x => x.Id == abstractCommand.Id);
if (commandIndex == -1)
{
await abstractCommand.UnPublishAutoDiscoveryConfigAsync();
await Variables.MqttManager.UnsubscribeAsync(abstractCommand);
Variables.Commands.RemoveAt(commandIndex);

Log.Information("[COMMANDS] Removed command: {command}", abstractCommand.Name);
Log.Information("[COMMANDS] Removed command: {command}", abstractCommand.EntityName);
}
else
{
Log.Information("[COMMANDS] Command not removed, not activated: {command}", abstractCommand.EntityName);
}
}
}

// copy our list to the main one
foreach (var abstractCommand in commands.Select(StoredCommands.ConvertConfiguredToAbstract))
{
if (abstractCommand == null) continue;
if (abstractCommand == null)
continue;

if (Variables.Commands.All(x => x.Id != abstractCommand.Id))
{
Expand All @@ -208,16 +217,16 @@ internal static async Task<bool> StoreAsync(List<ConfiguredCommand> commands, Li
await abstractCommand.PublishAutoDiscoveryConfigAsync();
await abstractCommand.PublishStateAsync(false);

Log.Information("[COMMANDS] Added command: {command}", abstractCommand.Name);
Log.Information("[COMMANDS] Added command: {command}", abstractCommand.EntityName);
continue;
}

// existing, update and re-register
var currentCommandIndex = Variables.Commands.FindIndex(x => x.Id == abstractCommand.Id);
if (Variables.Commands[currentCommandIndex].Name != abstractCommand.Name || Variables.Commands[currentCommandIndex].EntityType != abstractCommand.EntityType)
if (Variables.Commands[currentCommandIndex].EntityName != abstractCommand.EntityName || Variables.Commands[currentCommandIndex].EntityType != abstractCommand.EntityType)
{
// command changed, unregister and resubscribe on new mqtt channel
Log.Information("[COMMANDS] Command changed, re-registering as new entity: {old} to {new}", Variables.Commands[currentCommandIndex].Name, abstractCommand.Name);
Log.Information("[COMMANDS] Command changed, re-registering as new entity: {old} to {new}", Variables.Commands[currentCommandIndex].EntityName, abstractCommand.EntityName);

await Variables.Commands[currentCommandIndex].UnPublishAutoDiscoveryConfigAsync();
await Variables.MqttManager.UnsubscribeAsync(Variables.Commands[currentCommandIndex]);
Expand All @@ -228,7 +237,7 @@ internal static async Task<bool> StoreAsync(List<ConfiguredCommand> commands, Li
await abstractCommand.PublishAutoDiscoveryConfigAsync();
await abstractCommand.PublishStateAsync(false);

Log.Information("[COMMANDS] Modified command: {command}", abstractCommand.Name);
Log.Information("[COMMANDS] Modified command: {command}", abstractCommand.EntityName);
}

// annouce ourselves
Expand Down
Loading

0 comments on commit 223e413

Please sign in to comment.