CI: use local scons cache instead of building a separate image (#29634)

* use local

* added ci_sim

* revert scons

* dont need these anymore

* same for sim

* fix dockerfiles
old-commit-hash: c46965fc27
This commit is contained in:
Justin Newberry
2023-08-25 16:06:17 -07:00
committed by GitHub
parent b4e9669bc2
commit 643a13f27e
5 changed files with 4 additions and 26 deletions

View File

@@ -1,10 +1,6 @@
name: 'openpilot env setup'
inputs:
setup_docker_scons_cache:
description: 'Whether or not to build the scons-cache docker image'
required: false
default: 'false'
git_lfs:
description: 'Whether or not to pull the git lfs'
required: false
@@ -46,12 +42,4 @@ runs:
find . -type f -not -executable -not -perm 644 -exec chmod 644 {} \;
# build our docker image
- shell: bash
run: eval ${{ env.BUILD }}
- id: setup-scons-cache-docker
name: Sets up a docker image with scons cache that can by mounted as a buildkit cache mount
shell: bash
if: ${{ inputs.setup_docker_scons_cache == 'true' }}
run: |
cp selfdrive/test/Dockerfile.scons_cache $GITHUB_WORKSPACE/.ci_cache
cd $GITHUB_WORKSPACE/.ci_cache
DOCKER_BUILDKIT=1 docker build -t scons-cache -f Dockerfile.scons_cache .
run: eval ${{ env.BUILD }}

View File

@@ -53,8 +53,6 @@ jobs:
with:
submodules: true
- uses: ./.github/workflows/setup
with:
setup_docker_scons_cache: true
- name: Build base cl image
run: eval "$BUILD_CL"
- name: Setup to push to repo
@@ -76,7 +74,6 @@ jobs:
submodules: true
- uses: ./.github/workflows/setup
with:
setup_docker_scons_cache: true
git_lfs: false
- name: Setup to push to repo
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'