From af97e71063f9b91528fb0e65ba433c6d581ef3c0 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 12 Oct 2020 13:37:01 +0200 Subject: [PATCH] Try only extracting python folder (#2321) old-commit-hash: f258366e0c276bec0818286f5aeca1397eb51621 --- .github/workflows/sim_tests.yaml | 50 ++++++++++++++++---------------- tools/sim/install_carla.sh | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/sim_tests.yaml b/.github/workflows/sim_tests.yaml index bf1c600490..eaf8d33550 100644 --- a/.github/workflows/sim_tests.yaml +++ b/.github/workflows/sim_tests.yaml @@ -1,26 +1,26 @@ -# name: simulator -# on: -# push: -# pull_request: +name: simulator +on: + push: + pull_request: -# jobs: -# docker_build: -# name: build container -# runs-on: ubuntu-16.04 -# timeout-minutes: 50 -# if: github.repository == 'commaai/openpilot' -# steps: -# - uses: actions/checkout@v2 -# with: -# submodules: true -# lfs: true -# - name: Docker build -# run: | -# docker pull commaai/openpilot-sim:latest || true -# tools/sim/build_container.sh -# - name: Push to dockerhub -# if: github.ref == 'refs/heads/master' -# run: | -# docker login -u wmelching -p ${{ secrets.COMMA_DOCKERHUB_TOKEN }} -# docker tag commaai/openpilot-sim docker.io/commaai/openpilot-sim:latest -# docker push docker.io/commaai/openpilot-sim:latest +jobs: + docker_build: + name: build container + runs-on: ubuntu-16.04 + timeout-minutes: 50 + if: github.repository == 'commaai/openpilot' + steps: + - uses: actions/checkout@v2 + with: + submodules: true + lfs: true + - name: Docker build + run: | + docker pull commaai/openpilot-sim:latest || true + tools/sim/build_container.sh + - name: Push to dockerhub + if: github.ref == 'refs/heads/master' + run: | + docker login -u wmelching -p ${{ secrets.COMMA_DOCKERHUB_TOKEN }} + docker tag commaai/openpilot-sim docker.io/commaai/openpilot-sim:latest + docker push docker.io/commaai/openpilot-sim:latest diff --git a/tools/sim/install_carla.sh b/tools/sim/install_carla.sh index 652b1e0c3e..6b661e8dbb 100755 --- a/tools/sim/install_carla.sh +++ b/tools/sim/install_carla.sh @@ -8,7 +8,7 @@ curl -O http://carla-assets-internal.s3.amazonaws.com/Releases/Linux/$FILE rm -rf carla_tmp mkdir -p carla_tmp cd carla_tmp -tar xvf ../$FILE +tar xvf ../$FILE PythonAPI/ easy_install PythonAPI/carla/dist/carla-0.9.7-py3.5-linux-x86_64.egg || true cd .. rm -rf /tmp/$FILE