Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tzdata again, test on push #102

Merged
merged 7 commits into from
Nov 2, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert commenting out, add more debug messages
Signed-off-by: Louise Poubel <[email protected]>
chapulina committed Oct 30, 2020
commit 9dacae13db59d190aaf50601c121d415817d5da5
41 changes: 19 additions & 22 deletions tools/Dockerfile.citadel
Original file line number Diff line number Diff line change
@@ -20,28 +20,25 @@ RUN scripts/enable_gcc8.sh

COPY scripts/build_ign.sh scripts/build_ign.sh

# Skip libraries that coincide with Blueprint.
# Re-add them when blueprint goes EOL and is removed from 'all'

# RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-math ign-math6 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-tools ign-tools1 n \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-plugin ign-plugin1 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-common ign-common3 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-math ign-math6 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-tools ign-tools1 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-plugin ign-plugin1 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-common ign-common3 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh osrf sdformat sdf9 n \
$IGN_VERSION_DATE \
41 changes: 19 additions & 22 deletions tools/Dockerfile.dome
Original file line number Diff line number Diff line change
@@ -20,28 +20,25 @@ RUN scripts/enable_gcc8.sh

COPY scripts/build_ign.sh scripts/build_ign.sh

# Skip libraries that coincide with Citadel.
# Re-add them when citadel goes EOL and is removed from 'all'

# RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-math ign-math6 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-tools ign-tools1 n \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-plugin ign-plugin1 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
#
# RUN scripts/build_ign.sh ignitionrobotics ign-common ign-common3 y \
# $IGN_VERSION_DATE \
# $IGN_VERSION_PASSWORD
RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-math ign-math6 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-tools ign-tools1 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-plugin ign-plugin1 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh ignitionrobotics ign-common ign-common3 y \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD

RUN scripts/build_ign.sh osrf sdformat sdf10 n \
$IGN_VERSION_DATE \
4 changes: 4 additions & 0 deletions tools/build_docs.sh
Original file line number Diff line number Diff line change
@@ -29,18 +29,22 @@ s3cmd --dump-config > s3.cfg
# We are using docker because a library's documentation links to other
# library documentation, and we want to guarantee a clean system.
if [[ $1 == 'acropolis' || $1 == 'Acropolis' ]]; then
echo "Uploading documentation for Acropolis"
docker build -t ign-acropolis-docs -f Dockerfile.acropolis --build-arg IGN_VERSION_PASSWORD --build-arg IGN_VERSION_DATE=`date -Iseconds` --no-cache .
fi

if [[ $1 == 'all' || $1 == 'blueprint' || $1 == 'Blueprint' ]]; then
echo "Uploading documentation for Blueprint"
docker build -t ign-blueprint-docs -f Dockerfile.blueprint --build-arg IGN_VERSION_PASSWORD --build-arg IGN_VERSION_DATE=`date -Iseconds` --no-cache .
fi

if [[ $1 == 'all' || $1 == 'citadel' || $1 == 'Citadel' ]]; then
echo "Uploading documentation for Citadel"
docker build -t ign-citadel-docs -f Dockerfile.citadel --build-arg IGN_VERSION_PASSWORD --build-arg IGN_VERSION_DATE=`date -Iseconds` --no-cache .
fi

if [[ $1 == 'all' || $1 == 'dome' || $1 == 'Dome' ]]; then
echo "Uploading documentation for Dome"
docker build -t ign-dome-docs -f Dockerfile.dome --build-arg IGN_VERSION_PASSWORD --build-arg IGN_VERSION_DATE=`date -Iseconds` --no-cache .
fi

2 changes: 2 additions & 0 deletions tools/scripts/build_ign.sh
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ sudo make install

if [[ ! -z "$4" && "$4" != "n" ]]; then
# Upload documentation
echo "Upload documentation for $3"
sh upload_doc.sh $4

# Get the project version from cmake
@@ -33,5 +34,6 @@ if [[ ! -z "$4" && "$4" != "n" ]]; then
# Get the libName from the second parameter
libName=`echo "$2" | grep -oP "(?<=ign-).*"`

echo "Adding version [$version] for library [$libName]"
curl -k -X POST -d '{"libName":"'"$libName"'", "version":"'"$version"'", "releaseDate":"'"$5"'","password":"'"$6"'"}' https://api.ignitionrobotics.org/1.0/versions
fi