CI: Docs rebuild base image (#29566)

* docs rebuild base image

* fix order
old-commit-hash: 2e4f8e6608
beeps
Justin Newberry 2 years ago committed by GitHub
parent 7b99834975
commit e54655626d
  1. 8
      .github/workflows/setup/action.yaml
  2. 7
      .github/workflows/tools_tests.yaml

@ -32,6 +32,9 @@ runs:
restore-keys: | restore-keys: |
scons-${{ env.CACHE_COMMIT_DATE }}- scons-${{ env.CACHE_COMMIT_DATE }}-
scons- scons-
# build our docker image
- shell: bash
run: eval ${{ env.BUILD }}
- id: setup-scons-cache-docker - id: setup-scons-cache-docker
name: Sets up a docker image with scons cache that can by mounted as a buildkit cache mount name: Sets up a docker image with scons cache that can by mounted as a buildkit cache mount
shell: bash shell: bash
@ -39,7 +42,4 @@ runs:
run: | run: |
cp selfdrive/test/Dockerfile.scons_cache ~ cp selfdrive/test/Dockerfile.scons_cache ~
cd ~ cd ~
DOCKER_BUILDKIT=1 docker build -t scons-cache -f Dockerfile.scons_cache . DOCKER_BUILDKIT=1 docker build -t scons-cache -f Dockerfile.scons_cache .
# build our docker image
- shell: bash
run: eval ${{ env.BUILD }}

@ -75,10 +75,6 @@ jobs:
name: build docs name: build docs
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 45 timeout-minutes: 45
env:
BUILD: |
docker pull $DOCKER_REGISTRY/openpilot-docs:latest
DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -87,6 +83,9 @@ jobs:
with: with:
setup_docker_scons_cache: true setup_docker_scons_cache: true
git_lfs: false git_lfs: false
- name: Build docs image
run: |
DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
- name: Push docker container - name: Push docker container
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
run: | run: |

Loading…
Cancel
Save