[llvm] Add AArch64 support to the premerge tests (PR #155274)
Tom Stellard via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 25 13:05:34 PDT 2025
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/155274
>From 57697a66cfdddf2028c7260f1ce61ecacc550d00 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 17:15:36 +0000
Subject: [PATCH 01/14] Add AArch64 support to the premerge tests
---
.github/workflows/premerge.yaml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 9d925517a7211..6d83573702a79 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -28,7 +28,13 @@ jobs:
if: >-
github.repository_owner == 'llvm' &&
(github.event_name != 'pull_request' || github.event.action != 'closed')
- runs-on: llvm-premerge-linux-runners
+ matrix:
+ runs-on:
+ - llvm-premerge-linux-runners
+ - depot-ubuntu-24.04-arm-64
+ runs-on: ${{ matrix.runs-on }}
+ container:
+ image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && "ghcr.io/$GITHUB_REPOSITORY_OWNER/arm64v8/ci-ubuntu-24.04-agent" ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 8ba375b2d80614f4a769af1b417bf21f1712786c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 17:20:38 +0000
Subject: [PATCH 02/14] Fix typo
---
.github/workflows/premerge.yaml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 6d83573702a79..f88dbc6143ab4 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -28,10 +28,11 @@ jobs:
if: >-
github.repository_owner == 'llvm' &&
(github.event_name != 'pull_request' || github.event.action != 'closed')
- matrix:
- runs-on:
- - llvm-premerge-linux-runners
- - depot-ubuntu-24.04-arm-64
+ strategy:
+ matrix:
+ runs-on:
+ - llvm-premerge-linux-runners
+ - depot-ubuntu-24.04-arm-64
runs-on: ${{ matrix.runs-on }}
container:
image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && "ghcr.io/$GITHUB_REPOSITORY_OWNER/arm64v8/ci-ubuntu-24.04-agent" ) || null }}
>From af39d1af7635196606ceaeff6a2cf1db72e142e4 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 17:21:51 +0000
Subject: [PATCH 03/14] Fix quotes
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index f88dbc6143ab4..914713bb4a352 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,7 +35,7 @@ jobs:
- depot-ubuntu-24.04-arm-64
runs-on: ${{ matrix.runs-on }}
container:
- image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && "ghcr.io/$GITHUB_REPOSITORY_OWNER/arm64v8/ci-ubuntu-24.04-agent" ) || null }}
+ image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && 'ghcr.io/$GITHUB_REPOSITORY_OWNER/arm64v8/ci-ubuntu-24.04-agent' ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 0330faf41115cab59d8667dbe77bf9414ea3455c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 17:24:18 +0000
Subject: [PATCH 04/14] Fix container name
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 914713bb4a352..edb7248d792fe 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,7 +35,7 @@ jobs:
- depot-ubuntu-24.04-arm-64
runs-on: ${{ matrix.runs-on }}
container:
- image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && 'ghcr.io/$GITHUB_REPOSITORY_OWNER/arm64v8/ci-ubuntu-24.04-agent' ) || null }}
+ image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{}/arm64v8/ci-ubuntu-24.04-agent',github.repository_owner) ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 0492ee60484cd594f80b6cadcb7ebc5755b6710c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 17:29:25 +0000
Subject: [PATCH 05/14] Fix format string
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index edb7248d792fe..28d79518bc1df 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,7 +35,7 @@ jobs:
- depot-ubuntu-24.04-arm-64
runs-on: ${{ matrix.runs-on }}
container:
- image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{}/arm64v8/ci-ubuntu-24.04-agent',github.repository_owner) ) || null }}
+ image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04-agent',github.repository_owner) ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 493970e0713105bf8fa11ac120e04031366dc9fd Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 18:54:40 +0000
Subject: [PATCH 06/14] Drop cpus
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 28d79518bc1df..061e00294ee5f 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -32,7 +32,7 @@ jobs:
matrix:
runs-on:
- llvm-premerge-linux-runners
- - depot-ubuntu-24.04-arm-64
+ - depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
container:
image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04-agent',github.repository_owner) ) || null }}
>From 7a419796b746f1facba1731f07abd947e7641f2a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:02:41 +0000
Subject: [PATCH 07/14] Debug
---
.github/workflows/premerge.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 061e00294ee5f..404640fd960a8 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -43,6 +43,7 @@ jobs:
fetch-depth: 2
- name: Build and Test
run: |
+ cat $0
git config --global --add safe.directory '*'
source <(git diff --name-only HEAD~1...HEAD | python3 .ci/compute_projects.py)
>From 25c28a128fee05d2ff1db7fcd854e54275199b99 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:12:17 +0000
Subject: [PATCH 08/14] change containre
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 404640fd960a8..de13c596d6ebc 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,7 +35,7 @@ jobs:
- depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
container:
- image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04-agent',github.repository_owner) ) || null }}
+ image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner) ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 766987cf1664dbb5df2beaec23cce37231c9b2b4 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:16:45 +0000
Subject: [PATCH 09/14] Use standard runners
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index de13c596d6ebc..b90a0c436c44f 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -32,7 +32,7 @@ jobs:
matrix:
runs-on:
- llvm-premerge-linux-runners
- - depot-ubuntu-24.04-arm-4
+ - ubuntu-24.04-arm
runs-on: ${{ matrix.runs-on }}
container:
image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner) ) || null }}
>From 5f12fa20044740c157b0440127fae38390ea211d Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:33:21 +0000
Subject: [PATCH 10/14] Drop containe
---
.github/workflows/premerge.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index b90a0c436c44f..41c1307feb143 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -33,9 +33,8 @@ jobs:
runs-on:
- llvm-premerge-linux-runners
- ubuntu-24.04-arm
+ - depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
- container:
- image: ${{ (startsWith(matrix.runs-on, 'depot-ubuntu-24.04-arm') && format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner) ) || null }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From 31393e3f957aea5850d82a7c3b675f4c6952bac1 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:41:11 +0000
Subject: [PATCH 11/14] Debug image
---
.github/workflows/premerge.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 41c1307feb143..02dce133a8010 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,6 +35,8 @@ jobs:
- ubuntu-24.04-arm
- depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
+ container:
+ image: format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner)
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From c7e1a036161919b2226cde9480a9ec241de70911 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:48:50 +0000
Subject: [PATCH 12/14] Debug image
---
.github/workflows/premerge.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 02dce133a8010..4794dc6881c4e 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -31,7 +31,6 @@ jobs:
strategy:
matrix:
runs-on:
- - llvm-premerge-linux-runners
- ubuntu-24.04-arm
- depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
>From f7ae102d6e0ffcd483edf8abf588f17a90811da6 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 19:50:24 +0000
Subject: [PATCH 13/14] Debug image
---
.github/workflows/premerge.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 4794dc6881c4e..817604175a8ac 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -35,7 +35,7 @@ jobs:
- depot-ubuntu-24.04-arm-4
runs-on: ${{ matrix.runs-on }}
container:
- image: format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner)
+ image: ${{ format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner) }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
>From f6a5df8b5cb37c21de3f54ff0a95d27a09018f42 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Mon, 25 Aug 2025 20:03:08 +0000
Subject: [PATCH 14/14] Debug containre
---
.github/workflows/premerge.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 817604175a8ac..9bc0d4883d407 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -31,11 +31,10 @@ jobs:
strategy:
matrix:
runs-on:
- - ubuntu-24.04-arm
- - depot-ubuntu-24.04-arm-4
+ - ubuntu-24.04
runs-on: ${{ matrix.runs-on }}
container:
- image: ${{ format('ghcr.io/{0}/arm64v8/ci-ubuntu-24.04',github.repository_owner) }}
+ image: ${{ format('ghcr.io/{0}/ci-ubuntu-24.04',github.repository_owner) }}
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
More information about the llvm-commits
mailing list