Skip to content

Commit

Permalink
More build script updates for bitbucket -> GitHub (#181)
Browse files Browse the repository at this point in the history
* Windows jenkins scripts: clone deps from github
* Jenkins docker scripts: clone deps from github
* ignition_collection.dsl: use github
* gazebo-one_liner-homebrew: use github
* ignition_collection.dsl: Github -> GitHub
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
scpeters authored Apr 28, 2020
1 parent e634cd9 commit 00ba86d
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/ignition_collection.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ ignition_collections.each { ign_collection ->
// MAC Brew
// --------------------------------------------------------------
def ignition_brew_ci_job = job("ignition_${ign_collection_name}-ci-default-homebrew-amd64")
OSRFBrewCompilationAnyGithub.create(ignition_brew_ci_job,
OSRFBrewCompilationAnyGitHub.create(ignition_brew_ci_job,
"ignitionrobotics/ign-${ign_collection_name}",
false)
ignition_brew_ci_job.with
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/gazebo-one_liner-homebrew.bash
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ echo '# END SECTION'

echo '# BEGIN SECTION: run the one-liner installation'
# TODO: change this to 'curl -ssL https://get.gazebosim.org' once that supports https
curl -ssL https://bitbucket.org/osrf/release-tools/raw/default/one-line-installations/gazebo.sh | sh -x
curl -ssL https://github.com/ignition-tooling/release-tools/raw/master/one-line-installations/gazebo.sh | sh -x
echo '# END SECTION'
6 changes: 3 additions & 3 deletions jenkins-scripts/lib/gazebo-base-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install ign-fuel-tools
set IGN_TRANSPORT_DIR=%WORKSPACE%\ign-fuel-tools
if EXIST %IGN_TRANSPORT_DIR% ( rmdir /s /q %IGN_TRANSPORT_DIR% )
hg clone https://bitbucket.org/ignitionrobotics/ign-fuel-tools %IGN_TRANSPORT_DIR% -b ign-fuel-tools4
git clone https://github.com/ignitionrobotics/ign-fuel-tools %IGN_TRANSPORT_DIR% -b ign-fuel-tools4
set VCS_DIRECTORY=ign-fuel-tools
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand All @@ -68,7 +68,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install ign-transport
set IGN_TRANSPORT_DIR=%WORKSPACE%\ign-transport
if EXIST %IGN_TRANSPORT_DIR% ( rmdir /s /q %IGN_TRANSPORT_DIR% )
hg clone https://bitbucket.org/ignitionrobotics/ign-transport %IGN_TRANSPORT_DIR% -b ign-transport8
git clone https://github.com/ignitionrobotics/ign-transport %IGN_TRANSPORT_DIR% -b ign-transport8
set VCS_DIRECTORY=ign-transport
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand All @@ -79,7 +79,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install sdformat
set SDFORMAT_DIR=%WORKSPACE%\sdformat
if EXIST %SDFORMAT_DIR% ( rmdir /s /q %SDFORMAT_DIR% )
hg clone https://bitbucket.org/osrf/sdformat %SDFORMAT_DIR% -b sdf9
git clone https://github.com/osrf/sdformat %SDFORMAT_DIR% -b sdf9
set VCS_DIRECTORY=sdformat
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand Down
4 changes: 2 additions & 2 deletions jenkins-scripts/lib/gazebo9_10-base-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install ign-transport
set IGN_TRANSPORT_DIR=%WORKSPACE%\ign-transport
if EXIST %IGN_TRANSPORT_DIR% ( rmdir /s /q %IGN_TRANSPORT_DIR% )
hg clone https://bitbucket.org/ignitionrobotics/ign-transport %IGN_TRANSPORT_DIR% -b ign-transport4
git clone https://github.com/ignitionrobotics/ign-transport %IGN_TRANSPORT_DIR% -b ign-transport4
set VCS_DIRECTORY=ign-transport
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand All @@ -66,7 +66,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install sdformat
set SDFORMAT_DIR=%WORKSPACE%\sdformat
if EXIST %SDFORMAT_DIR% ( rmdir /s /q %SDFORMAT_DIR% )
hg clone https://bitbucket.org/osrf/sdformat %SDFORMAT_DIR% -b sdf6
git clone https://github.com/osrf/sdformat %SDFORMAT_DIR% -b sdf6
set VCS_DIRECTORY=sdformat
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand Down
4 changes: 2 additions & 2 deletions jenkins-scripts/lib/ign_transport-base-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install ign-math
set IGN_MATH_DIR=%WORKSPACE%\ign-math
if EXIST %IGN_MATH_DIR% ( rmdir /s /q %IGN_MATH_DIR% )
hg clone https://bitbucket.org/ignitionrobotics/ign-math -b ign-math3 %IGN_MATH_DIR%
git clone https://github.com/ignitionrobotics/ign-math -b ign-math3 %IGN_MATH_DIR%
set VCS_DIRECTORY=ign-math
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand All @@ -55,7 +55,7 @@ echo # END SECTION
echo # BEGIN SECTION: compile and install ign-msgs
set IGN_MSGS_DIR=%WORKSPACE%\ign-msgs
if EXIST %IGN_MSGS_DIR% ( rmdir /s /q %IGN_MSGS_DIR% )
hg clone https://bitbucket.org/ignitionrobotics/ign-msgs -b ign-msgs0 %IGN_MSGS_DIR%
git clone https://github.com/ignitionrobotics/ign-msgs -b ign-msgs0 %IGN_MSGS_DIR%
set VCS_DIRECTORY=ign-msgs
set KEEP_WORKSPACE=TRUE
set ENABLE_TESTS=FALSE
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/lib/sdformat-base-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ echo # END SECTION
IF %USE_IGNITION_ZIP% == FALSE (
echo # BEGIN SECTION: compile and install ign-math
IF exist %WORKSPACE%\ign-math ( rmdir /s /q %WORKSPACE%\ign-math ) || goto :error
hg clone https://bitbucket.org/ignitionrobotics/ign-math %WORKSPACE%\ign-math -u %IGNMATH_BRANCH% || goto :error
git clone https://github.com/ignitionrobotics/ign-math %WORKSPACE%\ign-math -u %IGNMATH_BRANCH% || goto :error
set VCS_DIRECTORY=ign-math
set KEEP_WORKSPACE=TRUE
call "%SCRIPT_DIR%\lib\project-default-devel-windows.bat"
Expand Down
4 changes: 2 additions & 2 deletions jenkins-scripts/lib/windows_library.bat
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ set IGN_PROJECT_DEPENDENCY_DIR=%LOCAL_WS%\%1
if exist %IGN_PROJECT_DEPENDENCY_DIR% ( rmdir /s /q %IGN_PROJECT_DEPENDENCY_DIR% )
if "%2"=="" (
echo Installing default branch of %1
hg clone https://bitbucket.org/ignitionrobotics/%1 %IGN_PROJECT_DEPENDENCY_DIR% -b default
git clone https://github.com/ignitionrobotics/%1 %IGN_PROJECT_DEPENDENCY_DIR% -b default
) else (
echo Installing branch %2 of %1
hg clone https://bitbucket.org/ignitionrobotics/%1 %IGN_PROJECT_DEPENDENCY_DIR% -b %2
git clone https://github.com/ignitionrobotics/%1 %IGN_PROJECT_DEPENDENCY_DIR% -b %2
)
cd /d %IGN_PROJECT_DEPENDENCY_DIR%
call .\configure.bat
Expand Down

0 comments on commit 00ba86d

Please sign in to comment.