@@ -122,7 +122,6 @@ function Invoke-CIInstall
122
122
)
123
123
# Make sure we have all the tags
124
124
Sync-PSTags - AddRemoteIfMissing
125
- $releaseTag = Get-ReleaseTag
126
125
127
126
if (Test-DailyBuild )
128
127
{
@@ -588,8 +587,6 @@ function Invoke-LinuxTestsCore
588
587
' ExcludeTag' = $testExcludeTag
589
588
' OutputFile' = $testResultsNoSudo
590
589
}
591
- # create packages if it is a full build
592
- $isFullBuild = Test-DailyBuild
593
590
594
591
# Get the experimental feature names and the tests associated with them
595
592
$ExperimentalFeatureTests = Get-ExperimentalFeatureTests
@@ -662,7 +659,7 @@ function Invoke-LinuxTestsCore
662
659
# Determine whether the build passed
663
660
try {
664
661
$allTestResultsWithNoExpFeature = @ ($pesterPassThruNoSudoObject , $pesterPassThruSudoObject )
665
- $allTestResultsWithExpFeatures = $noSudoResultsWithExpFeatures + $sudoResultsWithExpFeatures
662
+ $allTestResultsWithExpFeatures = @ ( $noSudoResultsWithExpFeatures , $sudoResultsWithExpFeatures )
666
663
# This throws if there was an error:
667
664
$allTestResultsWithNoExpFeature | ForEach-Object { Test-PSPesterResults - ResultObject $_ }
668
665
$allTestResultsWithExpFeatures | ForEach-Object { Test-PSPesterResults - ResultObject $_ - CanHaveNoResult }
@@ -672,53 +669,6 @@ function Invoke-LinuxTestsCore
672
669
$resultError = $_
673
670
$result = " FAIL"
674
671
}
675
- }
676
-
677
- # Build and test script for Linux and macOS:
678
- function Invoke-LinuxTests
679
- {
680
- param (
681
- [switch ]
682
- $SkipBuild
683
- )
684
-
685
- if (! $SkipBuild.IsPresent )
686
- {
687
- $releaseTag = Get-ReleaseTag
688
- Write-Log - Message " Executing ci.psm1 build and test on a Linux based operating system."
689
- $originalProgressPreference = $ProgressPreference
690
- $ProgressPreference = ' SilentlyContinue'
691
- try {
692
- # We use CrossGen build to run tests only if it's the daily build.
693
- Start-PSBuild - CrossGen - PSModuleRestore - CI - ReleaseTag $releaseTag - Configuration ' Release'
694
- }
695
- finally
696
- {
697
- $ProgressPreference = $originalProgressPreference
698
- }
699
- }
700
-
701
- Invoke-LinuxTestsCore
702
-
703
- try {
704
- $xUnitTestResultsFile = " $pwd /xUnitTestResults.xml"
705
- Start-PSxUnit - xUnitTestResultsFile $xUnitTestResultsFile
706
- # If there are failures, Test-XUnitTestResults throws
707
- Test-XUnitTestResults - TestResultsFile $xUnitTestResultsFile
708
- } catch {
709
- $result = " FAIL"
710
- if (! $resultError )
711
- {
712
- $resultError = $_
713
- }
714
- }
715
-
716
- $createPackages = $isFullBuild
717
-
718
- if ($createPackages )
719
- {
720
- New-LinuxPackage - NugetKey $env: NugetKey
721
- }
722
672
723
673
# If the tests did not pass, throw the reason why
724
674
if ( $result -eq " FAIL" )
0 commit comments