From 111b254f3d13352195b03b848f5403b388086344 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Wed, 30 Mar 2016 19:18:58 -0700 Subject: [PATCH] Remove psl-monad submodule Fix #656 --- .gitmodules | 3 --- .travis.yml | 2 +- README.md | 2 +- appveyor.yml | 4 ++-- src/monad | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) delete mode 160000 src/monad diff --git a/.gitmodules b/.gitmodules index c30b397ac2..8a49b569c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "src/libpsl-native"] path = src/libpsl-native url = https://github.com/PowerShell/psl-native.git -[submodule "src/monad"] - path = src/monad - url = https://github.com/PowerShell/psl-monad.git [submodule "src/omi"] path = src/omi url = https://github.com/Microsoft/omi.git diff --git a/.travis.yml b/.travis.yml index 12c6eae382..8e78e7449b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ git: submodules: false before_install: - git config --global url.git@github.com:.insteadOf https://github.com/ - - git submodule update --init --recursive -- src/libpsl-native src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester + - git submodule update --init --recursive -- src/libpsl-native src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester - sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - sudo apt-get -qq update diff --git a/README.md b/README.md index 49fc7adc61..4c11afb394 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ submodules either. Please follow the instructions on the [Open Source Hub][]. On Windows, many fewer submodules are needed, so specify them: ```sh -git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester +git submodule update --init --recursive -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester ``` ## Setup build environment diff --git a/appveyor.yml b/appveyor.yml index 281b5fea1c..e10ecacea6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ install: - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n" - ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent - git config --global url.git@github.com:.insteadOf https://github.com/ - - git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester + - git submodule update --init --recursive -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester - ps: Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1 - ps: ./install.ps1 -version 1.0.0.001888 @@ -46,7 +46,7 @@ test_script: # FullCLR Write-Host -Foreground Green 'Run FullCLR tests' $testResultsFileFullCLR = "$pwd\TestsResults.FullCLR.xml" - Start-DevPSGitHub -binDir $pwd\binFull -NoNewWindow -ArgumentList '-command', "Import-Module .\src\monad\monad\src\OSS\Pester; Import-Module .\bin\Modules\Microsoft.PowerShell.Platform; Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" + Start-DevPSGitHub -binDir $pwd\binFull -NoNewWindow -ArgumentList '-command', "Import-Module .\src\Microsoft.PowerShell.Linux.Host\Modules\Pester; Import-Module .\bin\Modules\Microsoft.PowerShell.Platform; Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $testResultsFileFullCLR)) # # Fail the build, if tests failed diff --git a/src/monad b/src/monad deleted file mode 160000 index 8abffd25eb..0000000000 --- a/src/monad +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8abffd25ebc33cbc0b4ce224b46e699704b01728