From aefdc096e14dfdbcfcc50d8492a0b6bfece9d402 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 23 May 2022 20:04:27 -0700 Subject: [PATCH 1/7] CI: add build job for latest Ubuntu --- .github/workflows/tools_tests.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 1e4ce7a4ae43e7..01fe2a2a9f062c 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -21,6 +21,19 @@ env: GITHUB_REPOSITORY -e GITHUB_RUN_ID -v /tmp/comma_download_cache:/tmp/comma_download_cache $BASE_IMAGE /bin/sh -c jobs: + build_latest_ubuntu: + name: build latest ubuntu + runs-on: ubuntu-22.04 + timeout-minutes: 60 + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - name: tools/ubuntu_setup.sh + run: tools/ubuntu_setup.sh + - name: Build openpilot + run: scons -j$(nproc) + plotjuggler: name: plotjuggler runs-on: ubuntu-20.04 From 4390482af2491b289c103b35695eff0e6c81e65c Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 23 May 2022 20:56:10 -0700 Subject: [PATCH 2/7] source --- .github/workflows/tools_tests.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 01fe2a2a9f062c..5bdd9d55b4a04c 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -32,7 +32,9 @@ jobs: - name: tools/ubuntu_setup.sh run: tools/ubuntu_setup.sh - name: Build openpilot - run: scons -j$(nproc) + run: | + source ~/.bashrc + scons -j$(nproc) plotjuggler: name: plotjuggler From 0fcd5c58a08111ea9f002b1c9855e98bbec299b1 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 11 Jun 2022 19:32:39 -0700 Subject: [PATCH 3/7] source env --- .github/workflows/tools_tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 5bdd9d55b4a04c..62b812a0f3777f 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -23,7 +23,7 @@ env: jobs: build_latest_ubuntu: name: build latest ubuntu - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 timeout-minutes: 60 steps: - uses: actions/checkout@v3 @@ -33,8 +33,8 @@ jobs: run: tools/ubuntu_setup.sh - name: Build openpilot run: | - source ~/.bashrc - scons -j$(nproc) + source tools/openpilot_env.sh + pipenv run scons -j$(nproc) plotjuggler: name: plotjuggler From bbeada8fbd7b62a9241a97dbb4a1256ad7c6ac6d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 11 Jun 2022 21:39:53 -0700 Subject: [PATCH 4/7] scons cache --- .github/workflows/selfdrive_tests.yaml | 2 +- .github/workflows/tools_tests.yaml | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 567fc05aa56e56..5bd9acc200ce91 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -94,7 +94,7 @@ jobs: run: | ${{ env.RUN }} "scons -j$(nproc) --extras --test && \ rm -rf /tmp/scons_cache/* && \ - scons -j$(nproc) --cache-populate" + scons -j$(nproc) --extras --test --cache-populate" #build_mac: # name: build macos diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 62b812a0f3777f..ccefdc572a2651 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -29,12 +29,27 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + - name: Cache scons + id: scons-cache + uses: actions/cache@03e00da99d75a2204924908e1cca7902cafce66b + with: + path: /tmp/scons_cache + key: scons-ubuntu-latest-${{ hashFiles('.github/workflows/tools_test.yaml') }}- + restore-keys: | + scons-ubuntu-latest-${{ hashFiles('.github/workflows/tools_test.yaml') }}- + scons-ubuntu-latest- + - name: tools/ubuntu_setup.sh run: tools/ubuntu_setup.sh - name: Build openpilot run: | source tools/openpilot_env.sh - pipenv run scons -j$(nproc) + pipenv run scons -j$(nproc) --extras --test + - name: Cleanup scons cache + run: | + source tools/openpilot_env.sh + rm -rf /tmp/scons_cache/* + pipenv run scons -j$(nproc) --extras --test --cache-populate plotjuggler: name: plotjuggler From 2e91b18eb2e11e1ec02ffe108a7f55a4fc58aa2c Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 11 Jun 2022 21:54:06 -0700 Subject: [PATCH 5/7] cache pyenv --- .github/workflows/tools_tests.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index ccefdc572a2651..e68a2b42484646 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -29,9 +29,17 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + - name: Cache pyenv + id: ubuntu-latest-pyenv + uses: actions/cache@v3 + with: + path: | + ~/.pyenv + ~/.local/share/virtualenvs/ + key: ubuntu-latest-python-${{ hashFiles('tools/ubuntu_setup.sh') }}- - name: Cache scons id: scons-cache - uses: actions/cache@03e00da99d75a2204924908e1cca7902cafce66b + uses: actions/cache@v3 with: path: /tmp/scons_cache key: scons-ubuntu-latest-${{ hashFiles('.github/workflows/tools_test.yaml') }}- From 11d2b4a8b2b455702415ff3f534b8f4799ad5774 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 11 Jun 2022 22:16:22 -0700 Subject: [PATCH 6/7] fix key --- .github/workflows/tools_tests.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index e68a2b42484646..650cd912404d5a 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -38,14 +38,14 @@ jobs: ~/.local/share/virtualenvs/ key: ubuntu-latest-python-${{ hashFiles('tools/ubuntu_setup.sh') }}- - name: Cache scons - id: scons-cache + id: ubuntu-latest-scons uses: actions/cache@v3 with: path: /tmp/scons_cache - key: scons-ubuntu-latest-${{ hashFiles('.github/workflows/tools_test.yaml') }}- + key: ubuntu-latest-scons-${{ hashFiles('.github/workflows/tools_test.yaml') }}- restore-keys: | - scons-ubuntu-latest-${{ hashFiles('.github/workflows/tools_test.yaml') }}- - scons-ubuntu-latest- + ubuntu-latest-scons-${{ hashFiles('.github/workflows/tools_test.yaml') }}- + ubuntu-latest-scons- - name: tools/ubuntu_setup.sh run: tools/ubuntu_setup.sh From 53f0d8f6a0db0bcfab78cf8712212c9784e262a2 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 11 Jun 2022 22:24:35 -0700 Subject: [PATCH 7/7] source --- .github/workflows/tools_tests.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 650cd912404d5a..b2433fba8f7fce 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -48,7 +48,9 @@ jobs: ubuntu-latest-scons- - name: tools/ubuntu_setup.sh - run: tools/ubuntu_setup.sh + run: | + source tools/openpilot_env.sh + tools/ubuntu_setup.sh - name: Build openpilot run: | source tools/openpilot_env.sh