Skip to content
This repository has been archived by the owner on Jan 21, 2022. It is now read-only.

Commit

Permalink
Sync and bump Garden
Browse files Browse the repository at this point in the history 
- Move garden-windows to code.cloudfoundry.org
- Remove un-needed deps (e.g. cf-test-helpers, ...)
- Bump all of dependencies to be the same as garden-runc-release v1.0.4
  • Loading branch information
Amin Jamali committed Dec 14, 2016
1 parent f895e2d commit 2952ea2
Show file tree
Hide file tree
Showing 55 changed files with 72 additions and 2,093 deletions.
99 changes: 42 additions & 57 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,15 @@
[submodule "src/github.com/cloudfoundry/garden-windows"]
path = src/github.com/cloudfoundry/garden-windows
url = https://github.com/cloudfoundry/garden-windows
[submodule "src/github.com/cloudfoundry-incubator/cf-lager"]
path = src/github.com/cloudfoundry-incubator/cf-lager
url = https://github.com/cloudfoundry-incubator/cf-lager
[submodule "src/github.com/cloudfoundry-incubator/garden"]
path = src/github.com/cloudfoundry-incubator/garden
url = https://github.com/cloudfoundry-incubator/garden
[submodule "src/github.com/bmizerany/pat"]
path = src/github.com/bmizerany/pat
url = https://github.com/bmizerany/pat
[submodule "src/github.com/cloudfoundry/dropsonde"]
path = src/github.com/cloudfoundry/dropsonde
url = https://github.com/cloudfoundry/dropsonde
[submodule "src/github.com/cloudfoundry/gosteno"]
path = src/github.com/cloudfoundry/gosteno
url = https://github.com/cloudfoundry/gosteno
[submodule "src/github.com/gogo/protobuf"]
path = src/github.com/gogo/protobuf
url = https://github.com/gogo/protobuf
[submodule "src/github.com/gorilla/websocket"]
path = src/github.com/gorilla/websocket
url = https://github.com/gorilla/websocket
[submodule "src/github.com/nu7hatch/gouuid"]
path = src/github.com/nu7hatch/gouuid
url = https://github.com/nu7hatch/gouuid
[submodule "src/github.com/pivotal-golang/lager"]
path = src/github.com/pivotal-golang/lager
url = https://github.com/pivotal-golang/lager
[submodule "src/github.com/pivotal-golang/localip"]
path = src/github.com/pivotal-golang/localip
url = https://github.com/pivotal-golang/localip
[submodule "src/github.com/tedsuo/ifrit"]
path = src/github.com/tedsuo/ifrit
url = https://github.com/tedsuo/ifrit
[submodule "src/github.com/tedsuo/rata"]
path = src/github.com/tedsuo/rata
url = https://github.com/tedsuo/rata
[submodule "src/github.com/gorilla/mux"]
path = src/github.com/gorilla/mux
url = https://github.com/gorilla/mux
[submodule "src/github.com/gorilla/context"]
path = src/github.com/gorilla/context
url = https://github.com/gorilla/context
[submodule "src/github.com/hydrogen18/stoppableListener"]
path = src/github.com/hydrogen18/stoppableListener
url = https://github.com/hydrogen18/stoppableListener
[submodule "src/github.com/cloudfoundry/loggregator"]
path = src/github.com/cloudfoundry/loggregator
url = https://github.com/cloudfoundry/loggregator
[submodule "src/github.com/onsi/ginkgo"]
path = src/github.com/onsi/ginkgo
url = https://github.com/onsi/ginkgo
[submodule "src/github.com/onsi/gomega"]
path = src/github.com/onsi/gomega
url = https://github.com/onsi/gomega
[submodule "src/github.com/cloudfoundry/sonde-go"]
path = src/github.com/cloudfoundry/sonde-go
url = https://github.com/cloudfoundry/sonde-go
[submodule "src/github.com/mitchellh/go-ps"]
path = src/github.com/mitchellh/go-ps
url = https://github.com/mitchellh/go-ps
[submodule "src/github.com/ugorji/go"]
path = src/github.com/ugorji/go
url = https://github.com/ugorji/go
[submodule "src/golang.org/x/net"]
path = src/golang.org/x/net
url = https://github.com/golang/net
Expand All @@ -73,6 +19,45 @@
[submodule "src/code.cloudfoundry.org/lager"]
path = src/code.cloudfoundry.org/lager
url = https://github.com/cloudfoundry/lager
[submodule "src/code.cloudfoundry.org/cflager"]
path = src/code.cloudfoundry.org/cflager
url = https://github.com/cloudfoundry/cflager
[submodule "src/github.com/gorilla/websocket"]
path = src/github.com/gorilla/websocket
url = https://github.com/gorilla/websocket
[submodule "src/github.com/cloudfoundry/dropsonde"]
path = src/github.com/cloudfoundry/dropsonde
url = https://github.com/cloudfoundry/dropsonde
[submodule "src/github.com/cloudfoundry/sonde-go"]
path = src/github.com/cloudfoundry/sonde-go
url = https://github.com/cloudfoundry/sonde-go
[submodule "src/github.com/nu7hatch/gouuid"]
path = src/github.com/nu7hatch/gouuid
url = https://github.com/nu7hatch/gouuid
[submodule "src/github.com/cloudfoundry/gosteno"]
path = src/github.com/cloudfoundry/gosteno
url = https://github.com/cloudfoundry/gosteno
[submodule "src/github.com/gogo/protobuf"]
path = src/github.com/gogo/protobuf
url = https://github.com/gogo/protobuf
[submodule "src/github.com/gorilla/mux"]
path = src/github.com/gorilla/mux
url = https://github.com/gorilla/mux
[submodule "src/github.com/hydrogen18/stoppableListener"]
path = src/github.com/hydrogen18/stoppableListener
url = https://github.com/hydrogen18/stoppableListener
[submodule "src/github.com/gorilla/context"]
path = src/github.com/gorilla/context
url = https://github.com/gorilla/context
[submodule "src/github.com/tedsuo/ifrit"]
path = src/github.com/tedsuo/ifrit
url = https://github.com/tedsuo/ifrit
[submodule "src/github.com/pivotal-golang/localip"]
path = src/github.com/pivotal-golang/localip
url = https://github.com/pivotal-golang/localip
[submodule "src/github.com/mitchellh/go-ps"]
path = src/github.com/mitchellh/go-ps
url = https://github.com/mitchellh/go-ps
[submodule "src/github.com/kardianos/osext"]
path = src/github.com/kardianos/osext
url = https://github.com/kardianos/osext
[submodule "src/code.cloudfoundry.org/garden-windows"]
path = src/code.cloudfoundry.org/garden-windows
url = https://github.com/cloudfoundry/garden-windows
8 changes: 4 additions & 4 deletions GardenWindowsRelease/GardenWindowsMSI/GardenWindowsMSI.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_30B1BD7A14614686BDBB94B9B9C9B622"
{
"SourcePath" = "8:..\\..\\src\\github.com\\cloudfoundry\\garden-windows\\Containerizer\\Containerizer\\Resources\\zlib1.dll"
"SourcePath" = "8:..\\..\\src\\code.cloudfoundry.org\\garden-windows\\Containerizer\\Containerizer\\Resources\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_ACA42DBD8EC64991ABB3254FB6DDBC0A"
Expand Down Expand Up @@ -2252,7 +2252,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F31F2AC2CBC34DEFB0FAFB38455370BB"
{
"SourcePath" = "8:..\\..\\src\\github.com\\cloudfoundry\\garden-windows\\Containerizer\\Containerizer\\Resources\\bsdtar.exe"
"SourcePath" = "8:..\\..\\src\\code.cloudfoundry.org\\garden-windows\\Containerizer\\Containerizer\\Resources\\bsdtar.exe"
"TargetName" = "8:tar.exe"
"Tag" = "8:"
"Folder" = "8:_ACA42DBD8EC64991ABB3254FB6DDBC0A"
Expand Down Expand Up @@ -2929,7 +2929,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0FBCBAE901F64B579433173F1B518C1C"
{
"SourcePath" = "8:..\\..\\src\\github.com\\cloudfoundry\\garden-windows\\containerizer\\Containerizer\\obj\\Debug\\Containerizer.exe"
"SourcePath" = "8:..\\..\\src\\code.cloudfoundry.org\\garden-windows\\containerizer\\Containerizer\\obj\\Debug\\Containerizer.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_ACA42DBD8EC64991ABB3254FB6DDBC0A"
Expand Down Expand Up @@ -3013,7 +3013,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A7300D2CF5FB45F8A8C5F6136672F546"
{
"SourcePath" = "8:..\\..\\src\\github.com\\cloudfoundry\\garden-windows\\containerizer\\Logger\\obj\\Debug\\Logger.dll"
"SourcePath" = "8:..\\..\\src\\code.cloudfoundry.org\\garden-windows\\containerizer\\Logger\\obj\\Debug\\Logger.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_ACA42DBD8EC64991ABB3254FB6DDBC0A"
Expand Down
12 changes: 6 additions & 6 deletions GardenWindowsRelease/GardenWindowsRelease.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GardenWindowsService", "Gar
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContainerizerService", "ContainerizerService\ContainerizerService.csproj", "{0C31B733-6F0E-447D-A55E-453213B26D51}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Containerizer", "..\src\github.com\cloudfoundry\garden-windows\containerizer\Containerizer\Containerizer.csproj", "{B512432C-BDE1-4108-8DCF-5EDB78FAC454}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Containerizer", "..\src\code.cloudfoundry.org\garden-windows\containerizer\Containerizer\Containerizer.csproj", "{B512432C-BDE1-4108-8DCF-5EDB78FAC454}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceConfigurator", "ServiceConfigurator\ServiceConfigurator.csproj", "{37CE20E8-7999-4F16-BC9F-C97566107BDC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "..\src\github.com\cloudfoundry\garden-windows\containerizer\Logger\Logger.csproj", "{642C3C03-E002-4A16-8117-5EBAE8ACB9A4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "..\src\code.cloudfoundry.org\garden-windows\containerizer\Logger\Logger.csproj", "{642C3C03-E002-4A16-8117-5EBAE8ACB9A4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame", "..\src\github.com\cloudfoundry\garden-windows\containerizer\IronFrame\IronFrame\IronFrame.csproj", "{5DE07F79-B758-4A04-B908-626E7577313E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame", "..\src\code.cloudfoundry.org\garden-windows\containerizer\IronFrame\IronFrame\IronFrame.csproj", "{5DE07F79-B758-4A04-B908-626E7577313E}"
ProjectSection(ProjectDependencies) = postProject
{61B46A01-4911-4E32-9065-C1ECD7650AFA} = {61B46A01-4911-4E32-9065-C1ECD7650AFA}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame.Host", "..\src\github.com\cloudfoundry\garden-windows\containerizer\IronFrame\IronFrame.Host\IronFrame.Host.csproj", "{6E4DD8FC-91E8-4C70-946D-4C37DF84C8CF}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame.Host", "..\src\code.cloudfoundry.org\garden-windows\containerizer\IronFrame\IronFrame.Host\IronFrame.Host.csproj", "{6E4DD8FC-91E8-4C70-946D-4C37DF84C8CF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame.Shared", "..\src\github.com\cloudfoundry\garden-windows\containerizer\IronFrame\IronFrame.Shared\IronFrame.Shared.csproj", "{CB7BA555-21FD-4C57-A629-A925B6A83A31}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFrame.Shared", "..\src\code.cloudfoundry.org\garden-windows\containerizer\IronFrame\IronFrame.Shared\IronFrame.Shared.csproj", "{CB7BA555-21FD-4C57-A629-A925B6A83A31}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities", "Utilities\Utilities.csproj", "{5BF61F53-923F-46C5-B160-D503B08B9B5A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Guard", "..\src\github.com\cloudfoundry\garden-windows\Containerizer\IronFrame\Guard\Guard.vcxproj", "{61B46A01-4911-4E32-9065-C1ECD7650AFA}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Guard", "..\src\code.cloudfoundry.org\garden-windows\Containerizer\IronFrame\Guard\Guard.vcxproj", "{61B46A01-4911-4E32-9065-C1ECD7650AFA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{C376857D-44AE-45BD-A89A-CF3A3C1A90D3}"
EndProject
Expand Down
10 changes: 5 additions & 5 deletions scripts/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SET GOBIN=%CD%\bin
SET DEVENV_PATH=%programfiles(x86)%\Microsoft Visual Studio 12.0\Common7\IDE
SET PATH=%GOBIN%;%GOROOT%;%PATH%;%DEVENV_PATH%
SET GOPATH=%CD%
SET CONTAINERIZER_BIN=%CD%\src\\github.com\cloudfoundry\garden-windows\containerizer\Containerizer\bin\Containerizer.exe
SET CONTAINERIZER_BIN=%CD%\src\\code.cloudfoundry.org\garden-windows\containerizer\Containerizer\bin\Containerizer.exe

for /f "tokens=*" %%a in ('git rev-parse HEAD') do (
set VERSION=%%a
Expand All @@ -29,18 +29,18 @@ go install github.com/onsi/gomega || exit /b 1
SET GOBIN=%CD%\GardenWindowsRelease\GardenWindowsMSI\go-executables

:: Install garden-windows to the MSI go-executables directory
go install github.com/cloudfoundry/garden-windows || exit /b 1
go install code.cloudfoundry.org/garden-windows || exit /b 1

pushd src\github.com\cloudfoundry\garden-windows\Containerizer || exit /b 1
pushd src\code.cloudfoundry.org\garden-windows\Containerizer || exit /b 1
call make.bat || exit /b 1
popd

pushd src\github.com\cloudfoundry\garden-windows || exit /b 1
pushd src\code.cloudfoundry.org\garden-windows || exit /b 1
ginkgo -r -noColor || exit /b 1
go build -o output\garden-windows.exe || exit /b 1
popd

robocopy src\github.com\cloudfoundry\garden-windows\output bosh-executables
robocopy src\code.cloudfoundry.org\garden-windows\output bosh-executables

pushd GardenWindowsRelease || exit /b 1
rmdir /S /Q packages
Expand Down
1 change: 0 additions & 1 deletion src/code.cloudfoundry.org/cflager
Submodule cflager deleted from 3b0406
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/garden
Submodule garden updated from e328e6 to d0a898
1 change: 1 addition & 0 deletions src/code.cloudfoundry.org/garden-windows
Submodule garden-windows added at d2574f
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/lager
Submodule lager updated 8 files
+176 −0 lagerflags/LICENSE
+15 −0 lagerflags/NOTICE
+56 −0 lagerflags/README.md
+67 −0 lagerflags/integration/integration_suite_test.go
+21 −0 lagerflags/integration/main.go
+69 −0 lagerflags/lagerflags.go
+11 −2 models.go
+27 −0 writer_sink_test.go
2 changes: 1 addition & 1 deletion src/github.com/bmizerany/pat
Submodule pat updated 4 files
+43 −29 README.md
+1 −4 bench_test.go
+47 −7 mux.go
+144 −132 mux_test.go
1 change: 0 additions & 1 deletion src/github.com/cloudfoundry-incubator/cf-lager
Submodule cf-lager deleted from f28b32
8 changes: 0 additions & 8 deletions src/github.com/cloudfoundry-incubator/cf-test-helpers/.travis.yml
View file

This file was deleted.

Loading

0 comments on commit 2952ea2

Please sign in to comment.