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

Update CircleCI to more modern docker image #691

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update CircleCI to more modern docker image #691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68957e8
Update CircleCI to more modern docker image
sbc100 Jan 25, 2021
2bfe224
.
sbc100 Jan 26, 2021
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
35 changes: 14 additions & 21 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ orbs:
executors:
bionic:
docker:
- image: buildpack-deps:bionic
# 3.6 is the current minimum requirement for emscripten
- image: cimg/python:3.6

jobs:
flake8:
Expand All @@ -16,10 +17,8 @@ jobs:
- run:
name: install pip
command: |
apt-get update -q
apt-get install -q -y python-pip python3-pip
- run: python2 -m pip install --upgrade pip
- run: python3 -m pip install --upgrade pip
sudo apt-get update -q
sudo apt-get install -q -y python-pip
- run: python2 -m pip install flake8==3.7.8
- run: python3 -m pip install flake8==3.7.8
- run: python2 -m flake8 --show-source --statistics
Expand All @@ -34,7 +33,9 @@ jobs:
- checkout
- run:
name: Install debian packages
command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
command: |
sudo apt-get update -q
sudo apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
- run: scripts/test.sh
- run: scripts/test_source_env.sh
- run:
Expand Down Expand Up @@ -132,9 +133,6 @@ jobs:
executor: bionic
steps:
- checkout
- run:
name: install docker
command: apt-get update -q && apt-get install -q -y docker.io
- setup_remote_docker:
version: 19.03.13
# Build and test the tip-of-tree build of EMSDK
Expand All @@ -149,9 +147,6 @@ jobs:
executor: bionic
steps:
- checkout
- run:
name: install docker
command: apt-get update -q && apt-get install -q -y docker.io
- setup_remote_docker:
version: 19.03.13
- run:
Expand All @@ -170,20 +165,18 @@ jobs:
executor: bionic
steps:
- checkout
- run: apt-get install -q -y curl gnupg
- run: |
sudo apt-get update -q
sudo apt-get install -q -y curl gnupg
- run: curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
- run: mv bazel.gpg /etc/apt/trusted.gpg.d/
- run: echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
- run:
name: install pip
command: |
apt-get update -q
apt-get install -q -y python3-pip
- run: sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
- run: echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sudo seems odd here... but if it works...

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is installing a new system-wide settings so it makes sense.

In general I think its better that the admin commands require sudo.. since it means that other are not running as root but a normal user.

- run: pip3 install absl-py
- run:
name: install bazel
command: |
apt-get install -q -y bazel
sudo apt-get update -q
sudo apt-get install -q -y bazel
- run: scripts/test_bazel.sh

workflows:
Expand Down