From 2ff7ea76e668e5115df1164b90babce837f25ead Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 14:36:54 -0300 Subject: [PATCH 01/12] upgrading qemu version to fix the issue --- .github/workflows/actions-deploy.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml index 5d0c3f5db..d72abcd19 100644 --- a/.github/workflows/actions-deploy.yml +++ b/.github/workflows/actions-deploy.yml @@ -1,9 +1,10 @@ name: CD on: - push: - branches: - - master + pull_request: +# push: +# branches: +# - master permissions: contents: write @@ -105,7 +106,7 @@ jobs: ./build/compressed-artifacts/* linux_arm_release: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: primary_release env: APP_VERSION: ${{ needs.primary_release.outputs.APP_VERSION }} @@ -121,7 +122,11 @@ jobs: name: native-image-source path: ./build/artifacts/native-image-source/ - - name: Configure Qemu + - name: Latest Qemu binaries (8.2x) + run: | + apt-get update && apt-get install -y qemu-user-static + + - name: Configure Qemu With Docker run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - name: Linux Arm Release From aad63809cc0b0785617aafe223880cdb1180d5d6 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 15:41:06 -0300 Subject: [PATCH 02/12] qemu upgrading --- .github/workflows/actions-deploy.yml | 6 +++--- RELEASE-NOTES.md | 3 +++ docker-compose-qemu.yaml | 6 ++++++ src/main/docker/qemu/Dockerfile | 9 +++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 docker-compose-qemu.yaml create mode 100644 src/main/docker/qemu/Dockerfile diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml index d72abcd19..917a84b4d 100644 --- a/.github/workflows/actions-deploy.yml +++ b/.github/workflows/actions-deploy.yml @@ -123,11 +123,11 @@ jobs: path: ./build/artifacts/native-image-source/ - name: Latest Qemu binaries (8.2x) - run: | - apt-get update && apt-get install -y qemu-user-static + run: | + docker-compose -f docker-compose-qemu.yaml build --progress=plain - name: Configure Qemu With Docker - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + run: docker run --rm --privileged defreitas/qemu-user-static --reset -p yes - name: Linux Arm Release run: | diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index da0d1e11a..10e7ece47 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,6 @@ +## 3.22.0 +* #473: Qemu upgrading to 8.2.x + ## 3.21.3 * #496: Fixing aarch binary not building diff --git a/docker-compose-qemu.yaml b/docker-compose-qemu.yaml new file mode 100644 index 000000000..b2cebfc7a --- /dev/null +++ b/docker-compose-qemu.yaml @@ -0,0 +1,6 @@ +version: '3' +services: + qemu_8: + image: defreitas/qemu-user-static:latest + build: + context: src/main/docker/qemu diff --git a/src/main/docker/qemu/Dockerfile b/src/main/docker/qemu/Dockerfile new file mode 100644 index 000000000..82551fa2f --- /dev/null +++ b/src/main/docker/qemu/Dockerfile @@ -0,0 +1,9 @@ +FROM multiarch/qemu-user-static:latest@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0 + +RUN wget "http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb" +RUN mkdir releases &&\ + dpkg-deb -X qemu-user-static_*.deb releases &&\ + echo "copying " &&\ + tree releases/usr/bin &&\ + cp -f releases/usr/bin/* /usr/bin/ + From c3e90740ae899a1e1a96e10e179391b262447904 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 15:41:21 -0300 Subject: [PATCH 03/12] [Gradle Release Plugin] - new version commit: '3.22.0-snapshot'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2f0206bcb..9e6bfaeda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.21.3-snapshot +version=3.22.0-snapshot From 35c8194be6cfb1fa60e7664d229ca6b17a3ef162 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 15:42:00 -0300 Subject: [PATCH 04/12] machine upgrade not necessary anymore --- .github/workflows/actions-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml index 917a84b4d..00a6d987f 100644 --- a/.github/workflows/actions-deploy.yml +++ b/.github/workflows/actions-deploy.yml @@ -106,7 +106,7 @@ jobs: ./build/compressed-artifacts/* linux_arm_release: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest needs: primary_release env: APP_VERSION: ${{ needs.primary_release.outputs.APP_VERSION }} From caa3a016038a8d3ce84a0fae91a4993f210e01bc Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 16:08:42 -0300 Subject: [PATCH 05/12] adjusting image --- Dockerfile.builder.linux-aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.builder.linux-aarch64 b/Dockerfile.builder.linux-aarch64 index ec493f39e..c67d2a925 100644 --- a/Dockerfile.builder.linux-aarch64 +++ b/Dockerfile.builder.linux-aarch64 @@ -1,4 +1,4 @@ -FROM arm64v8/debian:11-slim +FROM arm64v8/debian:11.9 RUN apt-get update -y &&\ apt-get install --force-yes -y build-essential curl &&\ From 14b65cb8a17f3d5aee78eece8916ed1e476785c7 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 16:24:05 -0300 Subject: [PATCH 06/12] setup new qemu emulator --- .github/workflows/actions-deploy.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml index 00a6d987f..068824699 100644 --- a/.github/workflows/actions-deploy.yml +++ b/.github/workflows/actions-deploy.yml @@ -122,12 +122,10 @@ jobs: name: native-image-source path: ./build/artifacts/native-image-source/ - - name: Latest Qemu binaries (8.2x) - run: | - docker-compose -f docker-compose-qemu.yaml build --progress=plain - - name: Configure Qemu With Docker - run: docker run --rm --privileged defreitas/qemu-user-static --reset -p yes + run: | + docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* &&\ + docker run --privileged --rm tonistiigi/binfmt:qemu-v8.1.5-43 --install all - name: Linux Arm Release run: | From bc2415d97771ab991cbbe21ec87f40766c178cf7 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 16:24:23 -0300 Subject: [PATCH 07/12] deleting unused code --- docker-compose-qemu.yaml | 6 ------ src/main/docker/qemu/Dockerfile | 9 --------- 2 files changed, 15 deletions(-) delete mode 100644 docker-compose-qemu.yaml delete mode 100644 src/main/docker/qemu/Dockerfile diff --git a/docker-compose-qemu.yaml b/docker-compose-qemu.yaml deleted file mode 100644 index b2cebfc7a..000000000 --- a/docker-compose-qemu.yaml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - qemu_8: - image: defreitas/qemu-user-static:latest - build: - context: src/main/docker/qemu diff --git a/src/main/docker/qemu/Dockerfile b/src/main/docker/qemu/Dockerfile deleted file mode 100644 index 82551fa2f..000000000 --- a/src/main/docker/qemu/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM multiarch/qemu-user-static:latest@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0 - -RUN wget "http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb" -RUN mkdir releases &&\ - dpkg-deb -X qemu-user-static_*.deb releases &&\ - echo "copying " &&\ - tree releases/usr/bin &&\ - cp -f releases/usr/bin/* /usr/bin/ - From 956828438116fdfc8849ec918707782e110fab69 Mon Sep 17 00:00:00 2001 From: Elvis De Freitas Souza Date: Tue, 25 Jun 2024 16:26:42 -0300 Subject: [PATCH 08/12] adjusting release notes --- RELEASE-NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 10e7ece47..340735e7a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,5 @@ ## 3.22.0 -* #473: Qemu upgrading to 8.2.x +* #473: Qemu upgrading ## 3.21.3 * #496: Fixing aarch binary not building From 7bbaae05f3db5abca589cb8a55d9a4852adb0246 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Thu, 27 Jun 2024 10:30:42 -0300 Subject: [PATCH 09/12] Upgrading debian image to fix gcc error failed to solve: process "/bin/sh -c apt-get update -y && apt-get install --force-yes -y build-essential curl && apt-get install --force-yes -y libz-dev zlib1g-dev zlib1g" did not complete successfully: exit code: 100 --- Dockerfile.builder.linux-aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.builder.linux-aarch64 b/Dockerfile.builder.linux-aarch64 index c67d2a925..c39d93f80 100644 --- a/Dockerfile.builder.linux-aarch64 +++ b/Dockerfile.builder.linux-aarch64 @@ -1,4 +1,4 @@ -FROM arm64v8/debian:11.9 +FROM arm64v8/debian:12 RUN apt-get update -y &&\ apt-get install --force-yes -y build-essential curl &&\ From d19475b59ab72ed2f53a4d928f95139ea274b8fe Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Thu, 27 Jun 2024 10:32:05 -0300 Subject: [PATCH 10/12] Revert "deleting unused code" This reverts commit bc2415d97771ab991cbbe21ec87f40766c178cf7. --- docker-compose-qemu.yaml | 6 ++++++ src/main/docker/qemu/Dockerfile | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 docker-compose-qemu.yaml create mode 100644 src/main/docker/qemu/Dockerfile diff --git a/docker-compose-qemu.yaml b/docker-compose-qemu.yaml new file mode 100644 index 000000000..b2cebfc7a --- /dev/null +++ b/docker-compose-qemu.yaml @@ -0,0 +1,6 @@ +version: '3' +services: + qemu_8: + image: defreitas/qemu-user-static:latest + build: + context: src/main/docker/qemu diff --git a/src/main/docker/qemu/Dockerfile b/src/main/docker/qemu/Dockerfile new file mode 100644 index 000000000..82551fa2f --- /dev/null +++ b/src/main/docker/qemu/Dockerfile @@ -0,0 +1,9 @@ +FROM multiarch/qemu-user-static:latest@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0 + +RUN wget "http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb" +RUN mkdir releases &&\ + dpkg-deb -X qemu-user-static_*.deb releases &&\ + echo "copying " &&\ + tree releases/usr/bin &&\ + cp -f releases/usr/bin/* /usr/bin/ + From 76dca0056303c6cdd0b1c81552a507e98c2c01c0 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Thu, 27 Jun 2024 10:32:13 -0300 Subject: [PATCH 11/12] Revert "setup new qemu emulator" This reverts commit 14b65cb8a17f3d5aee78eece8916ed1e476785c7. --- .github/workflows/actions-deploy.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions-deploy.yml b/.github/workflows/actions-deploy.yml index 068824699..00a6d987f 100644 --- a/.github/workflows/actions-deploy.yml +++ b/.github/workflows/actions-deploy.yml @@ -122,10 +122,12 @@ jobs: name: native-image-source path: ./build/artifacts/native-image-source/ - - name: Configure Qemu With Docker + - name: Latest Qemu binaries (8.2x) run: | - docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* &&\ - docker run --privileged --rm tonistiigi/binfmt:qemu-v8.1.5-43 --install all + docker-compose -f docker-compose-qemu.yaml build --progress=plain + + - name: Configure Qemu With Docker + run: docker run --rm --privileged defreitas/qemu-user-static --reset -p yes - name: Linux Arm Release run: | From 3f21f09af5047237b1cb673c373486c67a78e8c0 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Thu, 27 Jun 2024 10:34:32 -0300 Subject: [PATCH 12/12] adjusting release notes --- RELEASE-NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 340735e7a..14b808688 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,5 @@ ## 3.22.0 -* #473: Qemu upgrading +* #473: Qemu upgrade ## 3.21.3 * #496: Fixing aarch binary not building