Skip to content

Commit e6bff20

Browse files
authored
Finish switch to rdk-devenv images (viamrobotics#3163)
1 parent 84917b9 commit e6bff20

File tree

3 files changed

+7
-29
lines changed

3 files changed

+7
-29
lines changed

.github/workflows/docker.yml

+5-27
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,13 @@ on:
1414
# Don't forget to tag back to @main before merge.
1515

1616
jobs:
17-
canon-cache:
18-
name: Build Canon Cache Docker Images
17+
docker-cache:
18+
name: Build Cache Docker Images
1919
strategy:
2020
matrix:
2121
include:
22-
# canon
23-
- arch: ubuntu-latest
24-
tag: amd64
25-
platform: linux/amd64
26-
image: canon
27-
file: etc/Dockerfile.cache
28-
- arch: buildjet-2vcpu-ubuntu-2204-arm
29-
tag: arm64
30-
platform: linux/arm64
31-
image: canon
32-
file: etc/Dockerfile.cache
3322
# rdk-devenv
34-
- arch: ubuntu-latest
23+
- arch: buildjet-2vcpu-ubuntu-2204
3524
tag: amd64
3625
platform: linux/amd64
3726
image: rdk-devenv
@@ -46,19 +35,8 @@ jobs:
4635
platform: linux/arm/v7
4736
image: rdk-devenv
4837
file: etc/Dockerfile.cache
49-
# antique
50-
- arch: ubuntu-latest
51-
platform: linux/amd64
52-
image: antique
53-
file: etc/Dockerfile.antique-cache
54-
tag: amd64
55-
- arch: buildjet-2vcpu-ubuntu-2204-arm
56-
platform: linux/arm64
57-
image: antique
58-
file: etc/Dockerfile.antique-cache
59-
tag: arm64
6038
# antique2
61-
- arch: ubuntu-latest
39+
- arch: buildjet-2vcpu-ubuntu-2204
6240
platform: linux/amd64
6341
image: antique2
6442
file: etc/Dockerfile.antique-cache
@@ -97,7 +75,7 @@ jobs:
9775
file: ${{ matrix.file }}
9876

9977
test:
100-
needs: canon-cache
78+
needs: docker-cache
10179
uses: viamrobotics/rdk/.github/workflows/test.yml@main
10280
secrets:
10381
MONGODB_TEST_OUTPUT_URI: ${{ secrets.MONGODB_TEST_OUTPUT_URI }}

.github/workflows/license_finder.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Audit 3rd-Party Licenses
1010
runs-on: [ubuntu-latest]
1111
container:
12-
image: ghcr.io/viamrobotics/canon:amd64-cache
12+
image: ghcr.io/viamrobotics/rdk-devenv:amd64-cache
1313
options: --platform linux/amd64
1414
timeout-minutes: 30
1515

.github/workflows/npm-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository_owner == 'viamrobotics'
1313
runs-on: [ubuntu-latest]
1414
container:
15-
image: ghcr.io/viamrobotics/canon:amd64-cache
15+
image: ghcr.io/viamrobotics/rdk-devenv:amd64-cache
1616

1717
steps:
1818
- name: Checkout

0 commit comments

Comments
 (0)