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.

Sign up for GitHub

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

Fix tzdata again, test on push #102

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e421619
Fix tzdata again, test on push
chapulina Oct 8, 2020
ffed5c8
🤞 hopefully a fix, and make it a bit faster
chapulina Oct 9, 2020
d4d3fbe
Push Dome fixes to Blueprint and Citadel
chapulina Oct 9, 2020
b63c051
Run on schedule
chapulina Oct 12, 2020
f201512
using on push to test again
chapulina Oct 28, 2020
9dacae1
Revert commenting out, add more debug messages
chapulina Oct 30, 2020
6bcc0b0
back to schedule
chapulina Nov 2, 2020
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
8 changes: 4 additions & 4 deletions .github/workflows/nightly-upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Upload docs to production

on:
schedule:
# UTC timezone
- cron: '0 6 * * *'
on: push
# schedule:
# # UTC timezone
# - cron: '0 6 * * *'

jobs:
upload:
Expand Down
8 changes: 3 additions & 5 deletions tools/Dockerfile.blueprint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM ubuntu:bionic

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y \
sudo \
sudo tzdata \
&& apt-get clean

ARG IGN_VERSION_PASSWORD
Expand All @@ -13,10 +15,6 @@ COPY s3.cfg /root/.s3cfg
COPY scripts/install_common_deps.sh scripts/install_common_deps.sh
RUN scripts/install_common_deps.sh

# This is not strictly necessary, but makes things faster down the line.
COPY scripts/install_ign_deps.sh scripts/install_ign_deps.sh
RUN scripts/install_ign_deps.sh

COPY scripts/enable_gcc8.sh scripts/enable_gcc8.sh
RUN scripts/enable_gcc8.sh

Expand Down
9 changes: 4 additions & 5 deletions tools/Dockerfile.citadel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM ubuntu:bionic

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y \
sudo \
sudo tzdata \
&& apt-get clean

ARG IGN_VERSION_PASSWORD
Expand All @@ -13,14 +15,11 @@ COPY s3.cfg /root/.s3cfg
COPY scripts/install_common_deps.sh scripts/install_common_deps.sh
RUN scripts/install_common_deps.sh

# This is not strictly necessary, but makes things faster down the line.
COPY scripts/install_ign_deps.sh scripts/install_ign_deps.sh
RUN scripts/install_ign_deps.sh

COPY scripts/enable_gcc8.sh scripts/enable_gcc8.sh
RUN scripts/enable_gcc8.sh

COPY scripts/build_ign.sh scripts/build_ign.sh

RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD
Expand Down
1 change: 1 addition & 0 deletions tools/Dockerfile.dome
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ COPY scripts/enable_gcc8.sh scripts/enable_gcc8.sh
RUN scripts/enable_gcc8.sh

COPY scripts/build_ign.sh scripts/build_ign.sh

RUN scripts/build_ign.sh ignitionrobotics ign-cmake ign-cmake2 n \
$IGN_VERSION_DATE \
$IGN_VERSION_PASSWORD
Expand Down
4 changes: 4 additions & 0 deletions tools/build_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion tools/scripts/build_ign.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
set -o errexit
set -o verbose

DEBIAN_FRONTEND=noninteractive
export DEBIAN_FRONTEND=noninteractive

git clone https://github.com/$1/$2 -b $3
cd $2
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tools/scripts/install_common_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -o errexit
set -o verbose

DEBIAN_FRONTEND=noninteractive
export DEBIAN_FRONTEND=noninteractive

sudo apt-get update

Expand Down