Skip to content

Commit 2208f5f

Browse files
committed
Add arm64 and server tags
1 parent 2e28795 commit 2208f5f

6 files changed

+31
-27
lines changed

.github/workflows/build-armbian-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ jobs:
9292
push: true
9393
platforms: linux/arm64
9494
context: ${{ env.DOCKER_OUTPATH }}
95-
tags: "${{ inputs.docker_img }}-${{ inputs.source_branch }}:latest"
95+
tags: "${{ inputs.docker_img }}-${{ inputs.source_branch }}-arm64:latest"

.github/workflows/build-armbian-homeassistant-image.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,15 @@ on:
236236
options:
237237
- ext4
238238
- btrfs
239-
armbian_storage:
240-
description: "Select image storage type."
239+
armbian_edition:
240+
description: "Select image edition type."
241241
required: false
242-
default: "save"
242+
default: "server"
243243
type: choice
244244
options:
245-
- save
246-
- temp
245+
- server
246+
- desktop
247+
- beta
247248
builder_name:
248249
description: "Set Armbian builder signature."
249250
required: false
@@ -367,7 +368,7 @@ jobs:
367368
368369
# Output cleaning result information
369370
df -hT ${PWD}
370-
echo "build_tag=Armbian_HassIoSupervisor_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
371+
echo "build_tag=Armbian_HassIoSupervisor_${{ inputs.set_release }}_arm64_${{ inputs.armbian_edition }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
371372
echo "status=success" >> ${GITHUB_OUTPUT}
372373
373374
- name: Upload Armbian image to Release

.github/workflows/build-armbian-server-image.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,15 @@ on:
236236
options:
237237
- ext4
238238
- btrfs
239-
armbian_storage:
240-
description: "Select image storage type."
239+
armbian_edition:
240+
description: "Select image edition type."
241241
required: false
242-
default: "save"
242+
default: "server"
243243
type: choice
244244
options:
245-
- save
246-
- temp
245+
- server
246+
- desktop
247+
- beta
247248
builder_name:
248249
description: "Set Armbian builder signature."
249250
required: false
@@ -359,7 +360,7 @@ jobs:
359360
360361
# Output cleaning result information
361362
df -hT ${PWD}
362-
echo "build_tag=Armbian_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
363+
echo "build_tag=Armbian_${{ inputs.set_release }}_arm64_${{ inputs.armbian_edition }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
363364
echo "status=success" >> ${GITHUB_OUTPUT}
364365
365366
- name: Upload Armbian image to Release

.github/workflows/build-armbian-using-official-image.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,15 @@ on:
228228
options:
229229
- ext4
230230
- btrfs
231-
armbian_storage:
232-
description: "Select image storage type."
231+
armbian_edition:
232+
description: "Select image edition type."
233233
required: false
234-
default: "save"
234+
default: "server"
235235
type: choice
236236
options:
237-
- save
238-
- temp
237+
- server
238+
- desktop
239+
- beta
239240
builder_name:
240241
description: "Set Armbian builder signature."
241242
required: false
@@ -350,7 +351,7 @@ jobs:
350351
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
351352
352353
sudo timedatectl set-timezone "${TZ}"
353-
echo "build_tag=Armbian${set_release}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
354+
echo "build_tag=Armbian${set_release}_arm64_${{ inputs.armbian_edition }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
354355
echo "status=success" >> ${GITHUB_OUTPUT}
355356
356357
- name: Rebuild Armbian

.github/workflows/build-armbian-using-releases-files.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,15 @@ on:
236236
options:
237237
- ext4
238238
- btrfs
239-
armbian_storage:
240-
description: "Select image storage type."
239+
armbian_edition:
240+
description: "Select image edition type."
241241
required: false
242-
default: "save"
242+
default: "server"
243243
type: choice
244244
options:
245-
- save
246-
- temp
245+
- server
246+
- desktop
247+
- beta
247248
builder_name:
248249
description: "Set Armbian builder signature."
249250
required: false
@@ -335,7 +336,7 @@ jobs:
335336
-H "Accept: application/vnd.github+json" \
336337
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
337338
https://api.github.com/repos/${{ github.repository }}/releases?per_page=100 | \
338-
jq -r --arg RTK "Armbian_${{ inputs.set_release }}_" \
339+
jq -r --arg RTK "Armbian_${{ inputs.set_release }}_arm64_" \
339340
--arg BOARD "-trunk_" \
340341
'[.[] | select(.tag_name | contains($RTK))] |
341342
map(.assets[] | select(.browser_download_url | contains($BOARD) and endswith(".img.gz"))) |
@@ -353,7 +354,7 @@ jobs:
353354
[[ "${?}" -ne "0" ]] && echo "Invalid Armbian image download address." && exit 1
354355
cd "${armbian_buildpath}" && gzip -df *.img.gz && sync
355356
356-
echo "build_tag=Armbian_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
357+
echo "build_tag=Armbian_${{ inputs.set_release }}_arm64_${{ inputs.armbian_edition }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT}
357358
echo "status=success" >> ${GITHUB_OUTPUT}
358359
359360
- name: Rebuild Armbian [ ${{ inputs.set_release }} ]

.github/workflows/delete-older-releases-workflows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ on:
5050
releases_keep_keyword:
5151
description: "Keyword of the keep releases."
5252
required: false
53-
default: "v0/_save_/kernel_"
53+
default: "v0/server_/kernel_"
5454
delete_workflows:
5555
description: "Delete workflows records?"
5656
required: true

0 commit comments

Comments
 (0)