From 94a934851927db07f306439e44e39b6522aaa980 Mon Sep 17 00:00:00 2001 From: alexklimaj Date: Thu, 16 May 2024 21:55:38 -0600 Subject: [PATCH 1/2] add arm64-lts docker workflow --- .github/workflows/main.yml | 2 +- docker/Dockerfile.dockcross-linux-arm64-lts-custom | 6 ++++++ docker/build_and_push_docker_images.sh | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile.dockcross-linux-arm64-lts-custom diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3fe3ffdd01..645dbd1c72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -234,7 +234,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - arch_name: [armv6, armv7, arm64] + arch_name: [armv6, armv7, arm64, arm64-lts] steps: - uses: actions/checkout@v4 with: diff --git a/docker/Dockerfile.dockcross-linux-arm64-lts-custom b/docker/Dockerfile.dockcross-linux-arm64-lts-custom new file mode 100644 index 0000000000..d14dff9ca5 --- /dev/null +++ b/docker/Dockerfile.dockcross-linux-arm64-lts-custom @@ -0,0 +1,6 @@ +FROM dockcross/linux-arm64-lts + +ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-arm64-lts-custom + +RUN apt install rubygems -y +RUN gem install fpm diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh index 64026ca1a5..f9aeed346d 100755 --- a/docker/build_and_push_docker_images.sh +++ b/docker/build_and_push_docker_images.sh @@ -14,8 +14,10 @@ $DOCKER_CMD build -f Dockerfile-dev -t mavsdk/mavsdk-dev . $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-dockcross-linux-armv6-custom . $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom . $DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom . +$DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-lts-custom -t mavsdk/mavsdk-dockcross-linux-arm64-lts-custom . $DOCKER_CMD push mavsdk/mavsdk-dev:latest $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv6-custom:latest $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv7-custom:latest $DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-arm64-custom:latest +$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-arm64-lts-custom:latest From 1d1496996bf9ced53b7eba30f089e95d2c1e162d Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sun, 26 May 2024 17:21:31 +1200 Subject: [PATCH 2/2] CI: rename LTS build to debian11 --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 645dbd1c72..54c223a61b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -235,6 +235,9 @@ jobs: strategy: matrix: arch_name: [armv6, armv7, arm64, arm64-lts] + include: + - arch_name: arm64-lts + rename_distro: true steps: - uses: actions/checkout@v4 with: @@ -255,6 +258,11 @@ jobs: run: ./dockcross-linux-${{ matrix.arch_name }}-custom cmake --build build/linux-${{ matrix.arch_name }} -j2 --target install - name: create deb packages run: ./dockcross-linux-${{ matrix.arch_name }}-custom tools/create_packages.sh ./build/linux-${{ matrix.arch_name }}/install . ${{ matrix.arch_name }} libmavsdk-dev + - if: ${{ matrix.rename_distro }} + name: Rename LTS versions from debian12 to debian11 + run: | + sudo apt update && sudo apt install -y rename + rename 's/debian12_arm64/debian11_arm64/' *.deb - name: Publish artefacts if: startsWith(github.ref, 'refs/tags/v') uses: svenstaro/upload-release-action@v1-release