From 82418946e1feb693d686c8bc54365fced2534655 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Wed, 18 Mar 2020 17:50:44 -0600
Subject: [PATCH] Adds git tags command back and updates ZipBuildOutput to
 include .dll

---
 .github/scripts/ZipBuildOutput.ps1 | 4 +++-
 .github/workflows/docker.yml       | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/ZipBuildOutput.ps1 b/.github/scripts/ZipBuildOutput.ps1
index 485d0ab..a45cfc6 100644
--- a/.github/scripts/ZipBuildOutput.ps1
+++ b/.github/scripts/ZipBuildOutput.ps1
@@ -2,7 +2,7 @@ $destination = "$($Env:GITHUB_WORKSPACE)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include @("*.clz", "*.cpz", "*.cplz") | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include @("*.clz", "*.cpz", "*.cplz", "$($Env:GITHUB_WORKSPACE).dll") | ForEach-Object {
   $allowed = $true;
   foreach ($exclude in $exclusions) {
     if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) {
@@ -17,6 +17,8 @@ Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include @("*.clz", "*.c
 } | Copy-Item -Destination ($destination)
 Get-ChildItem "$($Env:GITHUB_WORKSPACE)\output" -include @("*.cpz", "*.clz", "*.cplz") | ForEach-Object {  
   $filenames = @($_ -replace "cpz|clz|cplz", "dll", $_ -replace "cpz|clz|cplz", "xml")
+  Write-Host "Filenames:"
+  Write-Host $filenames
   if ($filenames.length -gt 0) {
     Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination)
   }
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 71b0403..8b7044e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,7 +38,6 @@ jobs:
             Write-Host "Setting build type to Release"
             Write-Output "::set-env name=BUILD_TYPE::Release"
           }
-
       - name: Fetch tags
         run: git fetch --tags
       - name: Set Version Number
@@ -144,7 +143,7 @@ jobs:
           $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
           Write-Host "Branch: $branch"
           git push -u origin $($branch) --force
-          #git push --tags origin
+          git push --tags origin
       - name: Check Directory
         run: |
           Get-ChildItem "./"