Skip to content

Commit

Permalink
chore: update release build for arm
Browse files Browse the repository at this point in the history
  • Loading branch information
BorysTheDev committed Jan 30, 2025
1 parent efb7861 commit 0dbfcfd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 47 deletions.
55 changes: 10 additions & 45 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,60 +24,25 @@ jobs:
draft: true
token: ${{ secrets.GITHUB_TOKEN }}

build-qemu:
runs-on: ubuntu-latest
name: Build aarch64 on ubuntu20.04
build-arm:
runs-on: ubuntu-24.04-arm
name: Build arm64 on ubuntu-24.04-arm
needs: create-release
container:
image: ghcr.io/romange/ubuntu-dev:20
options: --security-opt seccomp=unconfined --sysctl "net.ipv6.conf.all.disable_ipv6=0"
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: uraimo/run-on-arch-action@v2
name: Run commands
id: runcmd
with:
arch: aarch64
distro: ubuntu20.04
githubToken: ${{ github.token }}
# Create an artifacts directory
setup: |
mkdir -p "${PWD}/artifacts"
# Mount the artifacts directory as /artifacts in the container
dockerRunArgs: |
--volume "${{ github.workspace }}:/src"
# The shell to run commands with in the container
shell: /bin/bash
install: |
export DEBIAN_FRONTEND=noninteractive
apt update && apt install -q -y autoconf-archive cmake curl git libssl-dev \
libunwind-dev ninja-build libtool gcc-9 g++-9 libboost-context-dev \
zip libzstd-dev debhelper moreutils bison zlib1g-dev
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 40 \
--slave /usr/bin/g++ g++ /usr/bin/g++-9
run: |
- name: Build artifacts
run: |
# Work around https://github.com/actions/checkout/issues/766
git config --global --add safe.directory /src
cd /src
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git describe --always --tags ${{ github.sha }}
if [ -d ${{ env.RELEASE_DIR }} ]; then
chown -R root ${{ env.RELEASE_DIR }}
ls -l ./${{ env.RELEASE_DIR }}
for i in `ls -d ./${{ env.RELEASE_DIR }}/_deps/*-src`; do
git config --global --add safe.directory $(realpath $i)
done
fi
./tools/release.sh
./tools/packaging/generate_debian_package.sh ${{ env.RELEASE_DIR }}/dragonfly-aarch64
mv dragonfly_*.deb ${{ env.RELEASE_DIR }}/
- name: Show the artifact
# Items placed in /src/${{ env.RELEASE_DIR }} in the container will be in
# ${PWD}/${{ env.RELEASE_DIR }} on the host.
run: |
echo finished
ls -al
- name: Upload
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -150,7 +115,7 @@ jobs:
path: results-artifacts/*
publish_release:
runs-on: ubuntu-latest
needs: [build-native, build-qemu]
needs: [build-native, build-arm]
steps:
- uses: actions/download-artifact@v4
name: Download files
Expand Down
3 changes: 2 additions & 1 deletion tools/packaging/generate_changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# apt install -y git moreutils
# note: This script should run on branch "main".

set -o xtrace
set -eu

if [ $# -ne 1 ]; then
Expand All @@ -32,7 +33,7 @@ fi
prevtag=v0.2.0
pkgname=`cat ${PACKGE_DIR}/control | grep '^Package: ' | sed 's/^Package: //'`
git tag -l v* | sort -V | while read tag; do
(echo "$pkgname (${tag#v}) unstable; urgency=low"; git log --pretty=format:' * %s' $prevtag..$tag; git log --pretty='format:%n%n -- %aN <%aE> %aD%n%n' $tag^..$tag) | cat - ${CHANGE_LOG} | sponge ${CHANGE_LOG}
(echo "$pkgname (${tag#v}) unstable; urgency=low"; git log -3 --pretty=format:' * %s'; git log -3 --pretty='format:%n%n -- %aN <%aE> %aD%n%n') | cat - ${CHANGE_LOG} | sponge ${CHANGE_LOG}
prevtag=$tag
done
if [ -f ${CHANGE_LOG} ]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/generate_debian_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Params:
# * optional location to the binary to place at the package


set -o xtrace
set -eu


Expand Down

0 comments on commit 0dbfcfd

Please sign in to comment.