From 76953b8f2be2add425c0befdf55d9381e6349184 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 15:38:40 -0500 Subject: [PATCH 1/5] Migrate all workflows to either github or buildjet runners --- .github/workflows/checks.yml | 4 +--- .github/workflows/license_finder.yml | 5 +---- .github/workflows/publish.yml | 4 +--- .github/workflows/test.yml | 4 +--- .github/workflows/update_protos.yml | 8 +++----- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 2b53555..2abf97c 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -12,9 +12,7 @@ on: jobs: checks: if: github.repository_owner == 'viamrobotics' - runs-on: [self-hosted, x64] - container: - image: ghcr.io/viamrobotics/canon:amd64 + runs-on: buildjet-4vcpu-ubuntu-2204 steps: - name: Checkout PR/Push/Workflow Dispatch uses: actions/checkout@v2 diff --git a/.github/workflows/license_finder.yml b/.github/workflows/license_finder.yml index be9399a..41dfce3 100644 --- a/.github/workflows/license_finder.yml +++ b/.github/workflows/license_finder.yml @@ -10,10 +10,7 @@ on: jobs: license_finder: name: Audit 3rd-Party Licenses - runs-on: [x64, qemu-host] - container: - image: ghcr.io/viamrobotics/canon:amd64-cache - options: --platform linux/amd64 + runs-on: ubuntu-latest timeout-minutes: 30 steps: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7e66417..d6fdddd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,9 +7,7 @@ on: jobs: publish: if: github.repository_owner == 'viamrobotics' - runs-on: [self-hosted, x64] - container: - image: ghcr.io/viamrobotics/canon:amd64 + runs-on: ubuntu-latest steps: - name: Check if organization member diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbbbbe4..3da9964 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,9 +12,7 @@ on: jobs: test: if: github.repository_owner == 'viamrobotics' - runs-on: [self-hosted, x64] - container: - image: ghcr.io/viamrobotics/canon:amd64 + runs-on: buildjet-4vcpu-ubuntu-2204 steps: - name: Checkout PR/Push/Workflow Dispatch uses: actions/checkout@v3 diff --git a/.github/workflows/update_protos.yml b/.github/workflows/update_protos.yml index e11fe7a..95525ad 100644 --- a/.github/workflows/update_protos.yml +++ b/.github/workflows/update_protos.yml @@ -9,9 +9,7 @@ on: jobs: update-protos: if: github.repository_owner == 'viamrobotics' - runs-on: [self-hosted, x64] - container: - image: ghcr.io/viamrobotics/canon:amd64 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: bufbuild/buf-setup-action@v1.7.0 @@ -32,5 +30,5 @@ jobs: delete-branch: true title: Automated Protos Update body: This is an auto-generated PR to update proto definitions. Check the commits to see which repos and commits are responsible for the changes - assignees: npmenard,stuqdog - reviewers: npmenard,stuqdog + assignees: njooma,stuqdog + reviewers: njooma,stuqdog From ff4bce3bd29d22aa29986e8c671d0881dfac964b Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 15:39:56 -0500 Subject: [PATCH 2/5] Change all buildjet-2vcpu-x86 runners to be github hosted --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4bb6c4..839e970 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -185,7 +185,7 @@ jobs: release: needs: [prepare, build_macos, build_linux] if: github.repository_owner == 'viamrobotics' - runs-on: buildjet-2vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 From 7ccdcfbabb93fa6a0ea6abd086ae999b65f2fc1a Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 16:01:34 -0500 Subject: [PATCH 3/5] Put canon image back into license checker --- .github/workflows/license_finder.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/license_finder.yml b/.github/workflows/license_finder.yml index 41dfce3..d22b58a 100644 --- a/.github/workflows/license_finder.yml +++ b/.github/workflows/license_finder.yml @@ -11,6 +11,9 @@ jobs: license_finder: name: Audit 3rd-Party Licenses runs-on: ubuntu-latest + container: + image: ghcr.io/viamrobotics/canon:amd64-cache + options: --platform linux/amd64 timeout-minutes: 30 steps: From 69360f35058b5c775a51e69608ead98ac6df35a3 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 16:59:18 -0500 Subject: [PATCH 4/5] Add canon image back to tests --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3da9964..97451da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,8 @@ jobs: test: if: github.repository_owner == 'viamrobotics' runs-on: buildjet-4vcpu-ubuntu-2204 + container: + image: ghcr.io/viamrobotics/canon:amd64 steps: - name: Checkout PR/Push/Workflow Dispatch uses: actions/checkout@v3 From 5264336eeaf0fa8b1435fb7181ce39d657072758 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 17:03:47 -0500 Subject: [PATCH 5/5] Use cached canon image --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 97451da..4e2c505 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: if: github.repository_owner == 'viamrobotics' runs-on: buildjet-4vcpu-ubuntu-2204 container: - image: ghcr.io/viamrobotics/canon:amd64 + image: ghcr.io/viamrobotics/canon:amd64-cache steps: - name: Checkout PR/Push/Workflow Dispatch uses: actions/checkout@v3