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

Use prebuilt Ubuntu Docker images for CIs #1520

Merged
merged 7 commits into from
Oct 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
COMPILER: gcc
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
DOCKERFILE: Dockerfile.ubuntu-xenial
DOCKER_NAME: dartsim/dart-dev:xenial-v6.10
BUILD_DARTPY: OFF
steps:
- template: .ci/azure-pipelines/docker.yml
Expand All @@ -23,7 +23,7 @@ jobs:
COMPILER: gcc
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
DOCKERFILE: Dockerfile.ubuntu-bionic
DOCKER_NAME: dartsim/dart-dev:bionic-v6.10
BUILD_DARTPY: OFF
steps:
- template: .ci/azure-pipelines/docker.yml
Expand All @@ -36,7 +36,7 @@ jobs:
COMPILER: gcc
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
DOCKERFILE: Dockerfile.ubuntu-focal
DOCKER_NAME: dartsim/dart-dev:focal-v6.10
BUILD_DARTPY: OFF
steps:
- template: .ci/azure-pipelines/docker.yml
Expand Down
17 changes: 9 additions & 8 deletions .ci/azure-pipelines/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ parameters:
numThreads: 4

steps:
- script: |
docker build -t ${DOCKERFILE,,} -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $(Build.SourcesDirectory):$(Build.SourcesDirectory) --env-file .ci/docker/env.list --name dart-docker ${DOCKERFILE,,};
docker exec dart-docker /bin/sh -c "cd $(Build.SourcesDirectory) && ./.ci/install.sh";
displayName: 'Install'
- script: |
docker exec dart-docker /bin/sh -c "cd $(Build.SourcesDirectory) && ./.ci/script.sh -j${{ parameters.numThreads }}";
displayName: 'Script'
- script: docker pull $DOCKER_NAME
displayName: "Pull dev container"
- script: |
docker run \
-v $(Build.SourcesDirectory):$(Build.SourcesDirectory) \
--env-file .ci/docker/env.list \
$DOCKER_NAME \
/bin/sh -c "cd $(Build.SourcesDirectory) && ./.ci/script.sh -j${{ parameters.numThreads }}"
displayName: "Build"
1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-bionic

This file was deleted.

1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-focal

This file was deleted.

1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-groovy

This file was deleted.

1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-trusty

This file was deleted.

1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-xenial

This file was deleted.

1 change: 0 additions & 1 deletion .ci/docker/Dockerfile.ubuntu-xenial-32bit

This file was deleted.

2 changes: 2 additions & 0 deletions .ci/install_linux.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env bash
set -ex

# TODO(JS): Remove this file once CODECOV and gh-page migrated to the Docker builds

# Sanity checks for required environment variables.
if [ -z "$BUILD_DARTPY" ]; then
echo "Info: Environment variable BUILD_DARTPY is unset. Using OFF by default."
Expand Down
118 changes: 57 additions & 61 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,97 +13,93 @@ on:
# Run every day at 02:00
- cron: "0 2 * * 0-6"

env:
# Hosted on: https://hub.docker.com/repository/docker/dartsim/dart-dev
DART_DEV_IMAGE: dartsim/dart-dev
UBUNTU_BUILD_CMD: |
docker run \
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
--env-file ./.ci/docker/env.list \
$DART_DEV_IMAGE:$DOCKER_TAG \
/bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/script.sh"

jobs:
xenial_gcc_release:
name: Ubuntu 16.04 [GCC|Release]
runs-on: ubuntu-20.04
env:
DOCKER_TAG: xenial-v6.10
COMPILER: gcc
BUILD_TYPE: Release
BUILD_DARTPY: OFF
steps:
- uses: actions/checkout@v1
- name: Install Dependencies
env:
COMPILER: gcc
DOCKERFILE: Dockerfile.ubuntu-xenial
BUILD_TYPE: Release
BUILD_DARTPY: OFF
run: |
docker build -t "${DOCKERFILE,,}" -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --env-file ./.ci/docker/env.list --name dart-docker "${DOCKERFILE,,}";
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/install.sh";
- name: Check out the repo
uses: actions/checkout@v2
- name: Pull dev container
run: docker pull ${{ env.DART_DEV_IMAGE }}:${{ env.DOCKER_TAG }}
- name: Build
run: |
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/script.sh";
run: ${{ env.UBUNTU_BUILD_CMD }}

bionic_gcc_release:
name: Ubuntu 18.04 [GCC|Release]
runs-on: ubuntu-20.04
env:
DOCKER_TAG: bionic-v6.10
COMPILER: gcc
BUILD_TYPE: Release
BUILD_DARTPY: ON
steps:
- uses: actions/checkout@v1
- name: Install Dependencies
env:
COMPILER: gcc
DOCKERFILE: Dockerfile.ubuntu-bionic
BUILD_TYPE: Release
BUILD_DARTPY: ON
run: |
docker build -t "${DOCKERFILE,,}" -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --env-file ./.ci/docker/env.list --name dart-docker "${DOCKERFILE,,}";
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/install.sh";
- name: Check out the repo
uses: actions/checkout@v2
- name: Pull dev container
run: docker pull ${{ env.DART_DEV_IMAGE }}:${{ env.DOCKER_TAG }}
- name: Build
run: |
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/script.sh";
run: ${{ env.UBUNTU_BUILD_CMD }}

focal_gcc_release:
name: Ubuntu 20.04 [GCC|Release]
runs-on: ubuntu-20.04
env:
DOCKER_TAG: focal-v6.10
COMPILER: gcc
BUILD_TYPE: Release
BUILD_DARTPY: ON
steps:
- uses: actions/checkout@v1
- name: Install Dependencies
env:
COMPILER: gcc
DOCKERFILE: Dockerfile.ubuntu-focal
BUILD_TYPE: Release
BUILD_DARTPY: ON
run: |
docker build -t "${DOCKERFILE,,}" -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --env-file ./.ci/docker/env.list --name dart-docker "${DOCKERFILE,,}";
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/install.sh";
- name: Check out the repo
uses: actions/checkout@v2
- name: Pull dev container
run: docker pull ${{ env.DART_DEV_IMAGE }}:${{ env.DOCKER_TAG }}
- name: Build
run: |
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/script.sh";
run: ${{ env.UBUNTU_BUILD_CMD }}

groovy_gcc_release:
name: Ubuntu 20.10 [GCC|Release]
runs-on: ubuntu-20.04
env:
DOCKER_TAG: groovy-v6.10
COMPILER: gcc
BUILD_TYPE: Release
BUILD_DARTPY: ON
steps:
- uses: actions/checkout@v1
- name: Install Dependencies
env:
COMPILER: gcc
DOCKERFILE: Dockerfile.ubuntu-groovy
BUILD_TYPE: Release
BUILD_DARTPY: ON
run: |
docker build -t "${DOCKERFILE,,}" -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --env-file ./.ci/docker/env.list --name dart-docker "${DOCKERFILE,,}";
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/install.sh";
- name: Check out the repo
uses: actions/checkout@v2
- name: Pull dev container
run: docker pull ${{ env.DART_DEV_IMAGE }}:${{ env.DOCKER_TAG }}
- name: Build
run: |
docker exec dart-docker /bin/sh -c "cd $GITHUB_WORKSPACE && ./.ci/script.sh";
run: ${{ env.UBUNTU_BUILD_CMD }}

catalina_clang_release:
name: macOS 10.15 [Clang|Release]
runs-on: macOS-10.15
env:
COMPILER: clang
BUILD_TYPE: Release
BUILD_DARTPY: ON
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Install Dependencies
env:
COMPILER: clang
run: .ci/install.sh
- name: Build
env:
COMPILER: clang
BUILD_TYPE: Release
BUILD_DARTPY: ON
run: sudo -E .ci/script.sh

windows_2019_msvc:
Expand All @@ -114,7 +110,7 @@ jobs:
VCPKG_ROOT: "C:/dartsim/vcpkg"
VCPKG_BUILD_TAG: v0.2.0-70f192e
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Install Dependencies
shell: cmd
run: |
Expand Down Expand Up @@ -143,7 +139,7 @@ jobs:
VCPKG_ROOT: "C:/dartsim/vcpkg"
VCPKG_BUILD_TAG: v0.2.0-70f192e
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Install Dependencies
shell: cmd
run: |
Expand Down
19 changes: 9 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,31 @@ matrix:

- os: linux
env:
- BUILD_NAME=XENIAL_32BIT_DEBUG_CODECOV
- DOCKERFILE="Dockerfile.ubuntu-xenial-32bit"
- BUILD_NAME=XENIAL_32BIT_RELEASE
- DOCKER_NAME=dartsim/dart-dev:xenial-32bit-v6.10
- BUILD_TYPE=Release # TODO: Tests fail in debug mode
- COMPILER=gcc
services: docker

- os: linux
env:
- BUILD_DOCS=ON
- DOCKERFILE="Dockerfile.ubuntu-bionic"
- BUILD_NAME=BIONIC_RELEASE_DOCS
- DOCKER_NAME=dartsim/dart-dev:bionic-docs
- BUILD_TYPE=Release
- COMPILER=gcc
- BUILD_DOCS=ON
services: docker

install:
- if [ -n "$DOCKERFILE" ]; then
docker build -t "${DOCKERFILE,,}" -f ".ci/docker/$DOCKERFILE" .;
docker run -itd -v $TRAVIS_BUILD_DIR:$TRAVIS_BUILD_DIR --env-file .ci/docker/env.list --name dart-docker "${DOCKERFILE,,}";
docker exec dart-docker /bin/sh -c "cd $TRAVIS_BUILD_DIR && ./.ci/install.sh";
- if [ -n "$DOCKER_NAME" ]; then
docker pull $DOCKER_NAME;
else
sudo -E .ci/install.sh;
fi

script:
- if [ -n "$DOCKERFILE" ]; then
docker exec dart-docker /bin/sh -c "cd $TRAVIS_BUILD_DIR && ./.ci/script.sh";
- if [ -n "$DOCKER_NAME" ]; then
docker run -v $TRAVIS_BUILD_DIR:$TRAVIS_BUILD_DIR --env-file .ci/docker/env.list $DOCKER_NAME /bin/sh -c "cd $TRAVIS_BUILD_DIR && ./.ci/script.sh";
else
sudo -E .ci/script.sh;
fi
Expand Down