diff --git a/.github/scripts/ZipBuildOutput.ps1 b/.github/scripts/ZipBuildOutput.ps1 index d8c70ff..485d0ab 100644 --- a/.github/scripts/ZipBuildOutput.ps1 +++ b/.github/scripts/ZipBuildOutput.ps1 @@ -2,22 +2,22 @@ $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") | ForEach-Object { $allowed = $true; - foreach($exclude in $exclusions) { - if((Split-Path $_.FullName -Parent).contains("$($exclude)")) { + foreach ($exclude in $exclusions) { + if ((Split-Path $_.FullName -Parent).contains("$($exclude)")) { $allowed = $false; break; - } } - if($allowed) { + } + if ($allowed) { Write-Host "allowing $($_)" $_; } } | 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") - if($filenames.length > 0) { + $filenames = @($_ -replace "cpz|clz|cplz", "dll", $_ -replace "cpz|clz|cplz", "xml") + 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 be197d4..960f265 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -97,12 +97,22 @@ jobs: uses: actions/download-artifact@v1 with: name: Build + path: ./build.zip - name: Download Version info uses: actions/download-artifact@v1 with: name: Version + path: ./version.zip + - name: Set Version Number + run: | + Expand-Archive -Path ./version.zip -DestinationPath ./ + $version = Get-Content -Path ./version.txt + Write-Output "::set-env name=VERSION::$version" + Remove-Item -Path ./version.zip + Remove-Item -Path ./version.txt - name: Check Directory - run: Get-ChildItem ${{env.GITHUB_WORKSPACE}} + run: | + Get-ChildItem ./ # public_push_output: # needs: build_project # runs-on: windows-latest