Skip to content

Commit

Permalink
Move Pester to submodule to Host/Modules
Browse files Browse the repository at this point in the history
This way it can also be deployed automatically, removing the last manual
copy steps from our build scripts.

Travis and AppVeyor configurations updated for new submodule location.
  • Loading branch information
andyleejordan committed Feb 10, 2016
1 parent 79f5db7 commit dacaebe
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
[submodule "src/windows-build"]
path = src/windows-build
url = https://github.com/PowerShell/psl-windows-build.git
[submodule "test/Pester"]
path = test/Pester
[submodule "src/Microsoft.PowerShell.Linux.Host/Modules/Pester"]
path = src/Microsoft.PowerShell.Linux.Host/Modules/Pester
url = https://github.com/PowerShell/psl-pester.git
branch = develop
ignore = dirty
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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 test/Pester
- git submodule update --init --recursive -- src/libpsl-native src/monad 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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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 test/Pester
- git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
- ps: Invoke-WebRequest -Uri https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest/dotnet-win-x64.latest.zip -OutFile dotnet.zip
- 7z x dotnet.zip -odotnet > nul

Expand Down
7 changes: 0 additions & 7 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
$BIN = "${pwd}/bin"

mkdir $BIN/Modules -ErrorAction SilentlyContinue

# Deploy PowerShell modules
cd $BIN/Modules
robocopy ../../test/Pester Pester /s /e
cd ../..

# Publish PowerShell
cd src/Microsoft.PowerShell.Linux.Host
dotnet publish --framework dnxcore50 --output $BIN
Expand Down
8 changes: 0 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

export BIN=$(pwd)/bin

mkdir -p $BIN/Modules

# Deploy PowerShell modules
(
cd $BIN/Modules
cp -r ../../test/Pester .
)

# Build native components
(
cd src/libpsl-native
Expand Down

0 comments on commit dacaebe

Please sign in to comment.