From 463c8865afb7b003ca54e946bbb12daf4851571a Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 16:25:07 -0700 Subject: [PATCH 01/21] test this --- .github/workflows/selfdrive_tests.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index bfad6e1e7dda22..b04db94da88019 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -120,6 +120,18 @@ jobs: - name: Building openpilot run: . .venv/bin/activate && scons -j$(nproc) + setup_all: + name: Setup openpilot on ${{ matrix.platform.runner }} + runs-on: ${{ matrix.platform.runner }} + strategy: + matrix: + platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, + {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, + {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] + steps: + - name: Install openpilot + run: curl -fsSL openpilot.comma.ai | bash + docker_push_multiarch: name: docker push multiarch tag runs-on: ubuntu-latest From 3246c8d4748d9c9045d6c88f60b351a241b94eea Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 16:27:48 -0700 Subject: [PATCH 02/21] test skip --- .github/workflows/selfdrive_tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index b04db94da88019..e235590ffc7733 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -128,6 +128,8 @@ jobs: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] + exclude: + - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && {"namespace-profile-arm64-2x8", "aarch64","aarch64"} }} steps: - name: Install openpilot run: curl -fsSL openpilot.comma.ai | bash From c213ffdbc80526c464bba5725cae3108a0ff4a62 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 16:31:16 -0700 Subject: [PATCH 03/21] try this --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index e235590ffc7733..3f714ec282e145 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -129,7 +129,7 @@ jobs: {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] exclude: - - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && {"namespace-profile-arm64-2x8", "aarch64","aarch64"} }} + - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && '{"namespace-profile-arm64-2x8", "aarch64","aarch64"}' }} steps: - name: Install openpilot run: curl -fsSL openpilot.comma.ai | bash From d38eebf94942f8fc7c12000cbc095ac9260c05b0 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 20:33:25 -0700 Subject: [PATCH 04/21] name --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 3f714ec282e145..736fad3aec203b 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -122,7 +122,7 @@ jobs: setup_all: name: Setup openpilot on ${{ matrix.platform.runner }} - runs-on: ${{ matrix.platform.runner }} + runs-on: ${{ matrix.platform.runner }}-${{ matrix.platform.arch }} strategy: matrix: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, From 855e4ed6f9483e76a76b0e0fd5c74bf8806534d2 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 20:36:59 -0700 Subject: [PATCH 05/21] fix name --- .github/workflows/selfdrive_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 736fad3aec203b..e84e2151f2e780 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -121,8 +121,8 @@ jobs: run: . .venv/bin/activate && scons -j$(nproc) setup_all: - name: Setup openpilot on ${{ matrix.platform.runner }} - runs-on: ${{ matrix.platform.runner }}-${{ matrix.platform.arch }} + name: Setup openpilot on ${{ matrix.platform.runner }}-${{ matrix.platform.arch }} + runs-on: ${{ matrix.platform.runner }} strategy: matrix: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, From a61a87ec446105dd4354909f10754373649a76f8 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 21:42:49 -0700 Subject: [PATCH 06/21] test all --- .github/workflows/selfdrive_tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index e84e2151f2e780..b63b1dea79747a 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -124,6 +124,7 @@ jobs: name: Setup openpilot on ${{ matrix.platform.runner }}-${{ matrix.platform.arch }} runs-on: ${{ matrix.platform.runner }} strategy: + fail-fast: false matrix: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, From 42ced02d0c9775888af56aa368b931d4e4806a31 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 21:52:40 -0700 Subject: [PATCH 07/21] should work --- .github/workflows/selfdrive_tests.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index b63b1dea79747a..b4340e0fb31070 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -127,11 +127,16 @@ jobs: fail-fast: false matrix: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, + {runner: "ubuntu-20.04", arch: "x86_64", scons_cache_tag: "x86_64"} {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] exclude: - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && '{"namespace-profile-arm64-2x8", "aarch64","aarch64"}' }} steps: + - name: Installing python + uses: actions/setup-python@v5 + with: + python-version: '3.12.3' - name: Install openpilot run: curl -fsSL openpilot.comma.ai | bash From 5f5c156335d1857658ffa00f8515aa8845eea2dd Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 21:53:37 -0700 Subject: [PATCH 08/21] fix syntax --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index b4340e0fb31070..2161fb3149c1f9 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -127,7 +127,7 @@ jobs: fail-fast: false matrix: platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, - {runner: "ubuntu-20.04", arch: "x86_64", scons_cache_tag: "x86_64"} + {runner: "ubuntu-20.04", arch: "x86_64", scons_cache_tag: "x86_64"}, {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] exclude: From ee740501dd3d087f627c280fd4467345c0bb3ac7 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 31 Jul 2024 21:57:02 -0700 Subject: [PATCH 09/21] test this --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 2161fb3149c1f9..fd0eb061c5221b 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - PYTHONWARNINGS: error + #PYTHONWARNINGS: error BASE_IMAGE: openpilot-base AZURE_TOKEN: ${{ secrets.AZURE_COMMADATACI_OPENPILOTCI_TOKEN }} From 62007eb633812b8750bbd59c9449749899d49ea0 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:15:27 -0700 Subject: [PATCH 10/21] try this --- .github/workflows/selfdrive_tests.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index fd0eb061c5221b..61c3e699af04e4 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -121,17 +121,18 @@ jobs: run: . .venv/bin/activate && scons -j$(nproc) setup_all: - name: Setup openpilot on ${{ matrix.platform.runner }}-${{ matrix.platform.arch }} - runs-on: ${{ matrix.platform.runner }} + name: Setup openpilot on ${{ matrix.platform[1] }} + runs-on: ${{ matrix.platform[0] }} strategy: fail-fast: false matrix: - platform: [ {runner: "ubuntu-24.04", arch: "x86_64", scons_cache_tag: "x86_64"}, - {runner: "ubuntu-20.04", arch: "x86_64", scons_cache_tag: "x86_64"}, - {runner: "macos-14", arch: "arm64", scons_cache_tag: "macos"}, - {runner: "namespace-profile-arm64-2x8", arch: "aarch64", scons_cache_tag: "aarch64"}] + platform: + - [ubuntu-24-04, Linux-x86_64, x86_64] + - [namespace-profile-arm64-2x8, Linux-aarch64, aarch64] + - [macos-14, MacOS-arm64, macos] + exclude: - - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && '{"namespace-profile-arm64-2x8", "aarch64","aarch64"}' }} + - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && '[namespace-profile-arm64-2x8, Linux-aarch64, aarch64]' }} steps: - name: Installing python uses: actions/setup-python@v5 From cd1595e3b222793047183e494d2f822e944824bf Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:18:05 -0700 Subject: [PATCH 11/21] test --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 61c3e699af04e4..f16718a462c43e 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -132,7 +132,7 @@ jobs: - [macos-14, MacOS-arm64, macos] exclude: - - platform: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' && '[namespace-profile-arm64-2x8, Linux-aarch64, aarch64]' }} + - platform: ${{ github.repository == 'commaai/openpilot' && [namespace-profile-arm64-2x8, Linux-aarch64, aarch64] }} steps: - name: Installing python uses: actions/setup-python@v5 From 8c1cdbd96bef880c7b840ff83ee64a057a3be7ad Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:42:02 -0700 Subject: [PATCH 12/21] exclude --- .github/workflows/selfdrive_tests.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index f16718a462c43e..2f263f3a4b8ceb 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -121,18 +121,17 @@ jobs: run: . .venv/bin/activate && scons -j$(nproc) setup_all: - name: Setup openpilot on ${{ matrix.platform[1] }} - runs-on: ${{ matrix.platform[0] }} + name: Setup openpilot on ${{ matrix.platform.name }} + runs-on: ${{ matrix.platform.runner }} strategy: fail-fast: false matrix: - platform: - - [ubuntu-24-04, Linux-x86_64, x86_64] - - [namespace-profile-arm64-2x8, Linux-aarch64, aarch64] - - [macos-14, MacOS-arm64, macos] - + platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64", scons_cache_tag: "x86_64"}, + {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}, + {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}] exclude: - - platform: ${{ github.repository == 'commaai/openpilot' && [namespace-profile-arm64-2x8, Linux-aarch64, aarch64] }} + - runner: "namespace-profile-arm64-2x8" + steps: - name: Installing python uses: actions/setup-python@v5 From 164125cf2d949b79ce945c02041b686a9080d58d Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:43:05 -0700 Subject: [PATCH 13/21] maybe? --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 2f263f3a4b8ceb..50afd7bfa6d126 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -130,7 +130,7 @@ jobs: {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}] exclude: - - runner: "namespace-profile-arm64-2x8" + - platform.runner: "namespace-profile-arm64-2x8" steps: - name: Installing python From 8fb8b1c8bd7d5b478e278925cf17721902efe04e Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:47:04 -0700 Subject: [PATCH 14/21] attribute --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 50afd7bfa6d126..bedaaf85418e93 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -130,7 +130,7 @@ jobs: {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}, {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}] exclude: - - platform.runner: "namespace-profile-arm64-2x8" + - {platform: {runner: "namespace-profile-arm64-2x8"}} steps: - name: Installing python From 0ccceda2d719eb824122c139ed3a7eb6387a7a54 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:55:30 -0700 Subject: [PATCH 15/21] test --- .github/workflows/selfdrive_tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index bedaaf85418e93..b3ee6e3ee9600d 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -127,10 +127,10 @@ jobs: fail-fast: false matrix: platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64", scons_cache_tag: "x86_64"}, - {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}, - {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}] + {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}, + {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}] exclude: - - {platform: {runner: "namespace-profile-arm64-2x8"}} + - {platform: {runner: "${{ github.event_name == 'pull_request' && 'namespace-profile-arm64-2x8' }}" }} steps: - name: Installing python From 2b3093f4d7bb176718e5c489e3464d8c5cc5d479 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 10:56:59 -0700 Subject: [PATCH 16/21] inverse test --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index b3ee6e3ee9600d..03c8afc0981738 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -130,7 +130,7 @@ jobs: {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}, {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}] exclude: - - {platform: {runner: "${{ github.event_name == 'pull_request' && 'namespace-profile-arm64-2x8' }}" }} + - {platform: {runner: "${{ github.event_name != 'pull_request' && 'namespace-profile-arm64-2x8' }}" }} steps: - name: Installing python From 6d969766dbf2ccd48774ff9feee5bec6d1ff0b65 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 11:26:00 -0700 Subject: [PATCH 17/21] no python --- .github/workflows/selfdrive_tests.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 03c8afc0981738..f3d5d7e5f7ff65 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -130,13 +130,9 @@ jobs: {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}, {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}] exclude: - - {platform: {runner: "${{ github.event_name != 'pull_request' && 'namespace-profile-arm64-2x8' }}" }} + - {platform: {runner: "${{ github.repository == 'commaai/openpilot' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'commaai/openpilot') && 'namespace-profile-arm64-2x8' }}" }} steps: - - name: Installing python - uses: actions/setup-python@v5 - with: - python-version: '3.12.3' - name: Install openpilot run: curl -fsSL openpilot.comma.ai | bash From 15abbac4a0622468c6cf175bee4fa0a29e506a6c Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 11:29:43 -0700 Subject: [PATCH 18/21] complement --- .github/workflows/selfdrive_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index f3d5d7e5f7ff65..b9c8cac5227f64 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -130,7 +130,7 @@ jobs: {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}, {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}] exclude: - - {platform: {runner: "${{ github.repository == 'commaai/openpilot' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'commaai/openpilot') && 'namespace-profile-arm64-2x8' }}" }} + - {platform: {runner: "${{ (github.repository != 'commaai/openpilot' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'commaai/openpilot')) && 'namespace-profile-arm64-2x8' }}" }} steps: - name: Install openpilot From ada80df11822949c6146c4e8531aa5833281202a Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 11:54:41 -0700 Subject: [PATCH 19/21] try build --- .github/workflows/selfdrive_tests.yaml | 27 ++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index b9c8cac5227f64..89a39d358dabee 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - #PYTHONWARNINGS: error + PYTHONWARNINGS: error BASE_IMAGE: openpilot-base AZURE_TOKEN: ${{ secrets.AZURE_COMMADATACI_OPENPILOTCI_TOKEN }} @@ -126,15 +126,34 @@ jobs: strategy: fail-fast: false matrix: - platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64", scons_cache_tag: "x86_64"}, - {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: "aarch64"}, - {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "macos"}] + platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64", scons_cache_tag: ""}, + {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: ""}, + {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "-macos"}] exclude: - {platform: {runner: "${{ (github.repository != 'commaai/openpilot' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'commaai/openpilot')) && 'namespace-profile-arm64-2x8' }}" }} steps: - name: Install openpilot run: curl -fsSL openpilot.comma.ai | bash + env: + PYTHONWARNINGS: default + + - name: Getting scons cache + uses: 'actions/cache/restore@v3' + with: + path: /tmp/scons_cache + key: scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }} + restore-keys: | + scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }}-${{ env.CACHE_COMMIT_DATE }} + scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }} + + - name: Install openpilot + run: curl -fsSL openpilot.comma.ai | bash + env: + PYTHONWARNINGS: default + + - name: Building openpilot + run: ./openpilot/tools/op.sh build -j4 docker_push_multiarch: name: docker push multiarch tag From ced600dfdeb5527b57d7e91c0d29b26c20589e34 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 11:59:56 -0700 Subject: [PATCH 20/21] cd --- .github/workflows/selfdrive_tests.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 89a39d358dabee..3ad21bda5064dd 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -147,13 +147,8 @@ jobs: scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }}-${{ env.CACHE_COMMIT_DATE }} scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }} - - name: Install openpilot - run: curl -fsSL openpilot.comma.ai | bash - env: - PYTHONWARNINGS: default - - name: Building openpilot - run: ./openpilot/tools/op.sh build -j4 + run: cd openpilot && ./openpilot/tools/op.sh build -j4 docker_push_multiarch: name: docker push multiarch tag From 100a4bb583e56c89500f25d512e8155e19291378 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 1 Aug 2024 12:11:12 -0700 Subject: [PATCH 21/21] simplify --- .github/workflows/selfdrive_tests.yaml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 3ad21bda5064dd..c26c5ee5daa69c 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -126,9 +126,9 @@ jobs: strategy: fail-fast: false matrix: - platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64", scons_cache_tag: ""}, - {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64", scons_cache_tag: ""}, - {runner: "macos-14", name: "MacOS-arm64", scons_cache_tag: "-macos"}] + platform: [ {runner: "ubuntu-24.04", name: "Linux-x86_64"}, + {runner: "namespace-profile-arm64-2x8", name: "Linux-aarch64"}, + {runner: "macos-14", name: "MacOS-arm64"}] exclude: - {platform: {runner: "${{ (github.repository != 'commaai/openpilot' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'commaai/openpilot')) && 'namespace-profile-arm64-2x8' }}" }} @@ -138,18 +138,6 @@ jobs: env: PYTHONWARNINGS: default - - name: Getting scons cache - uses: 'actions/cache/restore@v3' - with: - path: /tmp/scons_cache - key: scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }} - restore-keys: | - scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }}-${{ env.CACHE_COMMIT_DATE }} - scons-${{ runner.arch }}${{ matrix.platform.scons_cache_tag }} - - - name: Building openpilot - run: cd openpilot && ./openpilot/tools/op.sh build -j4 - docker_push_multiarch: name: docker push multiarch tag runs-on: ubuntu-latest