Skip to content

Commit daad9a4

Browse files
committed
action: run arm64 build on arm image
1 parent 8aea4ef commit daad9a4

1 file changed

Lines changed: 12 additions & 18 deletions

File tree

.github/workflows/build-rpm.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ env:
1111

1212
jobs:
1313
build-arm64:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-24.04-arm
1515
permissions:
1616
contents: read
1717
packages: read
1818
strategy:
1919
matrix:
2020
include:
2121
- tag: aarch64_el8
22-
platform: linux/arm64
2322
- tag: aarch64_el9
24-
platform: linux/arm64
2523
steps:
2624
- name: Checkout repository
2725
uses: actions/checkout@v4
2826

27+
- name: Run pullsrc.sh
28+
run: env ALL=1 ./pullsrc.sh
29+
2930
- name: Generate version-local.env
3031
run: |
3132
TAG=${{ github.ref_name }}
32-
# Extract bX from tag (e.g., v1.0.0b5 -> b5)
3333
BUILD_NUM=$(echo "$TAG" | grep -oE 'b[0-9]+' | tail -1)
3434
if [ -z "$BUILD_NUM" ]; then
3535
BUILD_NUM="b1"
@@ -38,11 +38,8 @@ jobs:
3838
echo "PKGREL=$BUILD_NUM" >> version-local.env
3939
cat version-local.env
4040
41-
- name: Run pullsrc.sh
42-
run: env ALL=1 ./pullsrc.sh
43-
44-
- name: Set up QEMU
45-
uses: docker/setup-qemu-action@v3
41+
- name: Set up Docker Buildx
42+
uses: docker/setup-buildx-action@v3
4643

4744
- name: Log in to Container Registry
4845
uses: docker/login-action@v3
@@ -55,7 +52,6 @@ jobs:
5552
run: |
5653
docker run --rm \
5754
-v $(pwd):/data \
58-
--platform ${{ matrix.platform }} \
5955
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.tag }}
6056
6157
- name: Upload RPM artifacts
@@ -81,10 +77,12 @@ jobs:
8177
- name: Checkout repository
8278
uses: actions/checkout@v4
8379

80+
- name: Run pullsrc.sh
81+
run: env ALL=1 ./pullsrc.sh
82+
8483
- name: Generate version-local.env
8584
run: |
8685
TAG=${{ github.ref_name }}
87-
# Extract bX from tag (e.g., v1.0.0b5 -> b5)
8886
BUILD_NUM=$(echo "$TAG" | grep -oE 'b[0-9]+' | tail -1)
8987
if [ -z "$BUILD_NUM" ]; then
9088
BUILD_NUM="b1"
@@ -93,9 +91,6 @@ jobs:
9391
echo "PKGREL=$BUILD_NUM" >> version-local.env
9492
cat version-local.env
9593
96-
- name: Run pullsrc.sh
97-
run: env ALL=1 ./pullsrc.sh
98-
9994
- name: Log in to Container Registry
10095
uses: docker/login-action@v3
10196
with:
@@ -130,10 +125,12 @@ jobs:
130125
- name: Checkout repository
131126
uses: actions/checkout@v4
132127

128+
- name: Run pullsrc.sh
129+
run: env ALL=1 ./pullsrc.sh
130+
133131
- name: Generate version-local.env
134132
run: |
135133
TAG=${{ github.ref_name }}
136-
# Extract bX from tag (e.g., v1.0.0b5 -> b5)
137134
BUILD_NUM=$(echo "$TAG" | grep -oE 'b[0-9]+' | tail -1)
138135
if [ -z "$BUILD_NUM" ]; then
139136
BUILD_NUM="b1"
@@ -142,9 +139,6 @@ jobs:
142139
echo "PKGREL=$BUILD_NUM" >> version-local.env
143140
cat version-local.env
144141
145-
- name: Run pullsrc.sh
146-
run: env ALL=1 ./pullsrc.sh
147-
148142
- name: Log in to Container Registry
149143
uses: docker/login-action@v3
150144
with:

0 commit comments

Comments
 (0)