mirror of
https://github.com/aphrody-labs/PowerShell.git
synced 2026-10-17 04:36:39 +00:00
Move Pester to submodule to Host/Modules
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.
This commit is contained in:
1 parent
79f5db71fe
commit
dacaebefb8
6 files changed
+4
-19
No files matched your search
+2
-2
@@ -17,8 +17,8 @@
|
|||||||
[submodule "src/windows-build"]
|
[submodule "src/windows-build"]
|
||||||
path = src/windows-build
|
path = src/windows-build
|
||||||
url = https://github.com/PowerShell/psl-windows-build.git
|
url = https://github.com/PowerShell/psl-windows-build.git
|
||||||
[submodule "test/Pester"]
|
[submodule "src/Microsoft.PowerShell.Linux.Host/Modules/Pester"]
|
||||||
path = test/Pester
|
path = src/Microsoft.PowerShell.Linux.Host/Modules/Pester
|
||||||
url = https://github.com/PowerShell/psl-pester.git
|
url = https://github.com/PowerShell/psl-pester.git
|
||||||
branch = develop
|
branch = develop
|
||||||
ignore = dirty
|
ignore = dirty
|
||||||
+1
-1
@@ -5,7 +5,7 @@ git:
|
|||||||
submodules: false
|
submodules: false
|
||||||
before_install:
|
before_install:
|
||||||
- git config --global url.git@github.com:.insteadOf https://github.com/
|
- 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 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-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
|
||||||
- sudo apt-get -qq update
|
- sudo apt-get -qq update
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ install:
|
|||||||
- ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
|
- ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
|
||||||
- ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
|
- ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
|
||||||
- git config --global url.git@github.com:.insteadOf https://github.com/
|
- 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
|
- 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
|
- 7z x dotnet.zip -odotnet > nul
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,5 @@
|
|||||||
$BIN = "${pwd}/bin"
|
$BIN = "${pwd}/bin"
|
||||||
|
|
||||||
mkdir $BIN/Modules -ErrorAction SilentlyContinue
|
|
||||||
|
|
||||||
# Deploy PowerShell modules
|
|
||||||
cd $BIN/Modules
|
|
||||||
robocopy ../../test/Pester Pester /s /e
|
|
||||||
cd ../..
|
|
||||||
|
|
||||||
# Publish PowerShell
|
# Publish PowerShell
|
||||||
cd src/Microsoft.PowerShell.Linux.Host
|
cd src/Microsoft.PowerShell.Linux.Host
|
||||||
dotnet publish --framework dnxcore50 --output $BIN
|
dotnet publish --framework dnxcore50 --output $BIN
|
||||||
|
|||||||
@@ -2,14 +2,6 @@
|
|||||||
|
|
||||||
export BIN=$(pwd)/bin
|
export BIN=$(pwd)/bin
|
||||||
|
|
||||||
mkdir -p $BIN/Modules
|
|
||||||
|
|
||||||
# Deploy PowerShell modules
|
|
||||||
(
|
|
||||||
cd $BIN/Modules
|
|
||||||
cp -r ../../test/Pester .
|
|
||||||
)
|
|
||||||
|
|
||||||
# Build native components
|
# Build native components
|
||||||
(
|
(
|
||||||
cd src/libpsl-native
|
cd src/libpsl-native
|
||||||
|
|||||||
File renamed without changes.
Reference in new issue
Block a user