.

Author: CBenoit

.github/workflows/ci.yml

@@ -477,7 +477,7 @@ jobs:
           New-Item -Path $PSStagingPath -ItemType Directory | Out-Null
           $PSModuleTarFilePath = Join-Path $PSStagingPath "$PSModuleName-ps-$PSModuleVersion.tar"
           Write-Host "PSModuleTarFilePath = $PSModuleTarFilePath"
-          tar -cvf "$PSModuleTarFilePath" -C "$PSModuleOutputPath"
+          tar -cvf "$PSModuleTarFilePath" -C "$PSModuleOutputPath" "$PSModuleName"
 
       - name: Pester tests
         shell: pwsh

.github/workflows/package.yml

@@ -250,18 +250,18 @@ jobs:
 
           Remove-Item $PSModuleTarFilePath -ErrorAction SilentlyContinue | Out-Null
 
+          $PSModuleParentPath = Split-Path $DGatewayPSModulePath -Parent
+
           # For some reason, when using Compress-Archive we end up with a corrupted archive once in the release.yml workflow.
           # Maybe because of the double compression via the upload-artifact action?
           # With a tarball archive, there is no problem.
           Write-Host "Recreate archive at "$PSModuleTarFilePath""
-          tar -cvf "$PSModuleTarFilePath" -C "$DGatewayPSModulePath"
+          tar -cvf "$PSModuleTarFilePath" -C "$PSModuleParentPath" DevolutionsGateway
 
           # Verify the the archive by extracting it to /dev/null.
           Write-Host "Verify archive at "$PSModuleTarFilePath""
           tar -xvf "$PSModuleTarFilePath" -C /dev/null
 
-          $PSModuleParentPath = Split-Path $DGatewayPSModulePath -Parent
-
           Set-PSDebug -Off # Too many traces are logged when running New-ModulePackage.
           New-ModulePackage $DGatewayPSModulePath $PSModuleParentPath