Skip to content

Commit 111b254

Browse files
author
Sergei Vorobev
committed
Remove psl-monad submodule
Fix #656
1 parent 43b5dfd commit 111b254

5 files changed

Lines changed: 4 additions & 8 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "src/libpsl-native"]
22
path = src/libpsl-native
33
url = https://github.com/PowerShell/psl-native.git
4-
[submodule "src/monad"]
5-
path = src/monad
6-
url = https://github.com/PowerShell/psl-monad.git
74
[submodule "src/omi"]
85
path = src/omi
96
url = https://github.com/Microsoft/omi.git

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git:
99
submodules: false
1010
before_install:
1111
- git config --global [email protected]:.insteadOf https://github.com/
12-
- git submodule update --init --recursive -- src/libpsl-native src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
12+
- git submodule update --init --recursive -- src/libpsl-native src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
1313
- sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
1414
- sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
1515
- sudo apt-get -qq update

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ submodules either. Please follow the instructions on the [Open Source Hub][].
4848
On Windows, many fewer submodules are needed, so specify them:
4949

5050
```sh
51-
git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
51+
git submodule update --init --recursive -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
5252
```
5353

5454
## Setup build environment

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ install:
2020
- ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
2121
- ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
2222
- git config --global [email protected]:.insteadOf https://github.com/
23-
- git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
23+
- git submodule update --init --recursive -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
2424
- ps: Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1
2525
- ps: ./install.ps1 -version 1.0.0.001888
2626

@@ -46,7 +46,7 @@ test_script:
4646
# FullCLR
4747
Write-Host -Foreground Green 'Run FullCLR tests'
4848
$testResultsFileFullCLR = "$pwd\TestsResults.FullCLR.xml"
49-
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"
49+
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"
5050
(New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $testResultsFileFullCLR))
5151
#
5252
# Fail the build, if tests failed

‎src/monad‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)