Skip to content

Commit 1392f42

Browse files
committed
Rename x86 and arm into amd64 and arm64 in GH workflow
1 parent fb21da6 commit 1392f42

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/presubmit.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
with:
182182
name: cvd-unit-tests-logs
183183
path: base/cvd/bazel-out/k8-fastbuild/testlogs
184-
build-debian-package-x86:
184+
build-debian-package-amd64:
185185
runs-on: ubuntu-22.04
186186
steps:
187187
- name: Free disk space
@@ -200,14 +200,14 @@ jobs:
200200
uses: ./.github/actions/build-debian-packages
201201
with:
202202
cache-path: "$HOME/bazel-disk-cache"
203-
- name: Build debs_x86.tar
204-
run: find . -name 'cuttlefish-*.deb' -print0 | tar -cvf debs_x86.tar --null --files-from -
205-
- name: Publish debs_x86.tar
203+
- name: Build debs_amd64.tar
204+
run: find . -name 'cuttlefish-*.deb' -print0 | tar -cvf debs_amd64.tar --null --files-from -
205+
- name: Publish debs_amd64.tar
206206
uses: actions/upload-artifact@v4
207207
with:
208-
name: debs_x86
209-
path: debs_x86.tar
210-
build-debian-package-arm:
208+
name: debs_amd64
209+
path: debs_amd64.tar
210+
build-debian-package-arm64:
211211
runs-on: ubuntu-22.04-arm
212212
steps:
213213
- name: Free disk space
@@ -226,27 +226,27 @@ jobs:
226226
uses: ./.github/actions/build-debian-packages
227227
with:
228228
cache-path: "$HOME/bazel-disk-cache"
229-
- name: Build debs_arm.tar
230-
run: find . -name 'cuttlefish-*.deb' -print0 | tar -cvf debs_arm.tar --null --files-from -
231-
- name: Publish debs_arm.tar
229+
- name: Build debs_arm64.tar
230+
run: find . -name 'cuttlefish-*.deb' -print0 | tar -cvf debs_arm64.tar --null --files-from -
231+
- name: Publish debs_arm64.tar
232232
uses: actions/upload-artifact@v4
233233
with:
234-
name: debs_arm
235-
path: debs_arm.tar
234+
name: debs_arm64
235+
path: debs_arm64.tar
236236
e2e-tests-orchestration-build-image:
237237
runs-on: ubuntu-24.04
238-
needs: [build-debian-package-x86]
238+
needs: [build-debian-package-amd64]
239239
steps:
240240
- name: Checkout repository
241241
uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
242242
- name: Download cuttlefish debs
243243
uses: actions/download-artifact@v4
244244
with:
245-
name: debs_x86
245+
name: debs_amd64
246246
github-token: ${{ github.token }}
247247
- name: Build image
248248
run: |
249-
tar -xvf debs_x86.tar
249+
tar -xvf debs_amd64.tar
250250
sudo podman info
251251
sudo podman build -f "tools/testutils/cw/Containerfile" --tag "android-cuttlefish-e2etest:latest" .
252252
sudo podman save --quiet -o android-cuttlefish-e2etest.tar localhost/android-cuttlefish-e2etest
@@ -335,7 +335,7 @@ jobs:
335335
df -h
336336
docker-image-check:
337337
runs-on: ubuntu-22.04
338-
needs: [build-debian-package-x86]
338+
needs: [build-debian-package-amd64]
339339
steps:
340340
- name: Free disk space
341341
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # aka v1.3.1
@@ -346,12 +346,12 @@ jobs:
346346
- name: Download cuttlefish debs
347347
uses: actions/download-artifact@v4
348348
with:
349-
name: debs_x86
349+
name: debs_amd64
350350
github-token: ${{ github.token }}
351351
- name: Run check
352352
shell: bash
353353
run: |
354-
tar -xvf debs_x86.tar
354+
tar -xvf debs_amd64.tar
355355
./docker/image-builder.sh -m dev
356356
docker images
357357
sudo docker run --privileged -d -p 2080:2080 cuttlefish-orchestration:latest

.github/workflows/update-bazel-cache.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: ./.github/actions/run-cvd-unit-tests
3030
with:
3131
cache-path: "$HOME/bazel-disk-cache"
32-
update-debian-package-x86-bazel-cache:
32+
update-debian-package-amd64-bazel-cache:
3333
if: ${{ github.repository_owner == 'google' }}
3434
runs-on: ubuntu-22.04
3535
steps:
@@ -50,7 +50,7 @@ jobs:
5050
uses: ./.github/actions/build-debian-packages
5151
with:
5252
cache-path: "$HOME/bazel-disk-cache"
53-
update-debian-package-arm-bazel-cache:
53+
update-debian-package-arm64-bazel-cache:
5454
if: ${{ github.repository_owner == 'google' }}
5555
runs-on: ubuntu-22.04-arm
5656
steps:

0 commit comments

Comments
 (0)