[build] Fix up aarch64 workflow.

Fix up the aarch4 workflow to use the docker-run-action and some minor
cleanup.
pull/1171/head
Suresh Sundriyal 12 months ago
parent a79689c286
commit b22edd5a26

@ -65,16 +65,18 @@ jobs:
env:
LNAV_BASENAME: lnav-${{ inputs.lnav_version_number }}
LNAV_ZIPNAME: lnav-${{ inputs.lnav_version_number }}-armv7l-linux-musl.zip
LNAV_ARTIFACT: lnav-linux-musl-armv7l.zip
CONT_PLATFORM: linux/arm/v7
steps:
- name: checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Run the armv7l Docker builder
- name: make
uses: addnab/docker-run-action@v3
with:
image: tstack/lnav-build:latest
options: -v ${{ github.workspace }}:/lnav -e GITHUB_WORKSPACE=/lnav --platform linux/arm/v7
options: -v ${{ github.workspace }}:/lnav -e GITHUB_WORKSPACE=/lnav --platform ${{ env.CONT_PLATFORM }}
run: /entrypoint.sh
- name: Build musl package
if: ${{ inputs.lnav_version_number != '' }}
@ -90,7 +92,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
# Artifact name
name: lnav-linux-musl-armv7l.zip
name: ${{ env.LNAV_ARTIFACT }}
# A file, directory or wildcard pattern that describes what to upload
path: ${{ github.workspace }}/lbuild/src/lnav
- name: Upload musl-binary archive
@ -106,22 +108,26 @@ jobs:
build-musl-arm64v8:
runs-on: ubuntu-latest
container:
image: tstack/lnav-build:latest
options: --platform linux/arm64
env:
LNAV_BASENAME: lnav-${{ inputs.lnav_version_number }}
LNAV_ZIPNAME: lnav-${{ inputs.lnav_version_number }}-aarch64-linux-musl.zip
LNAV_ARTIFACT: lnav-linux-musl-aarch64.zip
CONT_PLATFORM: linux/arm64
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: make
run: /entrypoint.sh
uses: addnab/docker-run-action@v3
with:
image: tstack/lnav-build:latest
options: -v ${{ github.workspace }}:/lnav -e GITHUB_WORKSPACE=/lnav --platform ${{ env.CONT_PLATFORM }}
run: /entrypoint.sh
- name: Build musl package
if: ${{ inputs.lnav_version_number != '' }}
run: >-
cd ${{ github.workspace }}
mkdir ${{ env.LNAV_BASENAME }} &&
cd ${{ env.LNAV_BASENAME }} &&
cp ../NEWS.md ../README . &&
@ -132,9 +138,9 @@ jobs:
uses: actions/upload-artifact@v3
with:
# Artifact name
name: lnav-linux-musl-aarch64.zip
name: ${{ env.LNAV_ARTIFACT }}
# A file, directory or wildcard pattern that describes what to upload
path: lbuild/src/lnav
path: ${{ github.workspace }}/lbuild/src/lnav
- name: Upload musl-binary archive
uses: actions/upload-release-asset@v1.0.2
if: ${{ inputs.upload_url != '' }}
@ -142,7 +148,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: ${{ env.LNAV_ZIPNAME }}
asset_path: ${{ github.workspace }}/${{ env.LNAV_ZIPNAME }}
asset_name: ${{ env.LNAV_ZIPNAME }}
asset_content_type: application/octet-stream

Loading…
Cancel
Save