Revert "ci: run some jobs only on push (#26202)"

This reverts commit 8e0e99f77c4e7294df4c57e013c45a1e570cd5ef.

old-commit-hash: 335351123a
taco
Cameron Clough 3 years ago
parent b913ad5337
commit eef468fd85
  1. 11
      .github/workflows/selfdrive_tests.yaml
  2. 5
      .github/workflows/tools_tests.yaml

@ -33,7 +33,6 @@ jobs:
name: build release name: build release
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 30 timeout-minutes: 30
if: github.event_name == 'push'
env: env:
STRIPPED_DIR: /tmp/releasepilot STRIPPED_DIR: /tmp/releasepilot
steps: steps:
@ -68,7 +67,6 @@ jobs:
name: build all name: build all
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 30 timeout-minutes: 30
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -87,7 +85,6 @@ jobs:
# name: build macos # name: build macos
# runs-on: macos-latest # runs-on: macos-latest
# timeout-minutes: 60 # timeout-minutes: 60
# if: github.event_name == 'push'
# steps: # steps:
# - uses: actions/checkout@v3 # - uses: actions/checkout@v3
# with: # with:
@ -145,7 +142,7 @@ jobs:
name: docker push name: docker push
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 22 timeout-minutes: 22
if: github.ref == 'refs/heads/master' && github.event_name == 'push' && github.repository == 'commaai/openpilot' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
needs: static_analysis # hack to ensure slow tests run first since this and static_analysis are fast needs: static_analysis # hack to ensure slow tests run first since this and static_analysis are fast
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -170,7 +167,6 @@ jobs:
name: static analysis name: static analysis
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 20 timeout-minutes: 20
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -185,7 +181,6 @@ jobs:
name: valgrind name: valgrind
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 20 timeout-minutes: 20
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -204,7 +199,6 @@ jobs:
name: unit tests name: unit tests
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 30 timeout-minutes: 30
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -285,7 +279,6 @@ jobs:
name: model tests name: model tests
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 20 timeout-minutes: 20
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -314,7 +307,6 @@ jobs:
name: longitudinal name: longitudinal
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 20 timeout-minutes: 20
if: github.event_name == 'push'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -343,7 +335,6 @@ jobs:
name: cars name: cars
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
timeout-minutes: 20 timeout-minutes: 20
if: github.event_name == 'push'
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:

@ -4,6 +4,7 @@ on:
push: push:
branches-ignore: branches-ignore:
- 'testing-closet*' - 'testing-closet*'
pull_request:
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}-${{ github.event_name }} group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}-${{ github.event_name }}
@ -82,7 +83,9 @@ jobs:
run: | run: |
DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile . DOCKER_BUILDKIT=1 docker build --pull --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.repository == 'commaai/openpilot' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
run: | run: |
$DOCKER_LOGIN $DOCKER_LOGIN
docker push $DOCKER_REGISTRY/openpilot-docs:latest docker push $DOCKER_REGISTRY/openpilot-docs:latest

Loading…
Cancel
Save