build-sd-images.yml: Fix armbian build

Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias Knöppler 2023-10-18 00:12:08 +02:00
parent f1b1f643bc
commit 48b361bf4a
No known key found for this signature in database
GPG Key ID: 3510056072886A8F
3 changed files with 7 additions and 6 deletions

View File

@ -64,7 +64,6 @@ jobs:
continue-on-error: true
run: |
set -ex
export LIB_TAG=master
export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
[[ "${{ github.ref_protected }}" == true ]] || export DBG=x
@ -83,7 +82,6 @@ jobs:
echo -e "${LOG_CICD} Cleanup armbian build leftovers..."
sudo rm -rf armbian/ tmp/ output/
export LIB_TAG=master
export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
[[ "${{ github.ref_protected }}" == true ]] || export DBG=x
@ -179,6 +177,9 @@ jobs:
sudo rm -rf raspbian_root
. ./build/buildlib.sh
mount_raspbian "ncp.img"
[[ -f raspbian_root/etc/machine-id ]] || sudo systemd-id128 new > ./raspbian_root/etc/machine-id
sudo cat raspbian_root/etc/machine-id
sudo systemd-id128 new | sudo tee ./raspbian_root/etc/machine-id
sudo wget -nv https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O raspbian_root/usr/bin/qemu-aarch64-static
sudo wget -nv https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-arm-static -O raspbian_root/usr/bin/qemu-arm-static
sudo chmod +x raspbian_root/usr/bin/qemu-{arm,aarch64}-static

View File

@ -100,7 +100,7 @@ jobs:
# TODO: Fix 32bit armbian images
odroidxu4:
# if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
# if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
if: ${{ false }}
uses: ./.github/workflows/build-sd-images.yml
with:
@ -126,7 +126,7 @@ jobs:
secrets: inherit
# TODO: Fix 32bit armbian images
bananapi:
#if: ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
# if: ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
if: ${{ false }}
uses: ./.github/workflows/build-sd-images.yml
with:

View File

@ -37,7 +37,7 @@ Vagrant.configure("2") do |config|
# Provision the VM
config.vm.provision "shell", inline: $script, env: {"BOARD_ID" => ENV['BOARD_ID'], "BOARD_NAME" => ENV['BOARD_NAME']}
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "../..", "/tmp/nextcloudpi", type: "rsync", rsync_exclude: ["armbian", ".git", ".venv", "cache", "raspbian_root", "output", "tmp", ".idea"]
config.vm.synced_folder "./output", "/tmp/ncp-out", type: "sshfs"
config.vm.synced_folder "../..", "/tmp/nextcloudpi", type: "rsync", rsync__exclude: ["/armbian/", ".venv/", "/cache/", "/raspbian_root/", "/output/", "/tmp/", "/.idea/"]
config.vm.synced_folder "../../output", "/tmp/ncp-out", type: "sshfs"
end