From f3f6af00b3bc4d496cec0a1b893af19db330b188 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:30:23 +0300 Subject: [PATCH 01/14] Update Dockerfile --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e5c147..cf6a3e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM debian:stable-slim -ARG VERSION=12.3.1-1.1 +ARG VERSION=12.3.rel1 RUN ARCH="$(dpkg --print-architecture)" && \ case $ARCH in \ "amd64") \ - ARCH_TAG="x64" \ + ARCH_TAG="x86_64" \ ;; \ "arm64") \ - ARCH_TAG="arm64" \ + ARCH_TAG="aarch64" \ ;; \ esac && \ # Get nessecary packages @@ -23,11 +23,13 @@ RUN ARCH="$(dpkg --print-architecture)" && \ rm -rf /var/cache/apt && \ mkdir /workdir && \ cd /workdir && \ - wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ - tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ - rm xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz + wget https://developer.arm.com/-/media/Files/downloads/gnu/${VERSION}/binrel/arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz \ + tar xvf arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ + #wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ + #tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ + rm arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz -RUN echo 'export PATH="/workdir/xpack-arm-none-eabi-gcc-'${VERSION}'/bin:$PATH"' >> /etc/bashrc +RUN echo 'export PATH="/workdir/xarm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc ADD entrypoint.sh /entrypoint.sh From 006ce15983b5d5905e930d7d965597f02da7b8e0 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:33:32 +0300 Subject: [PATCH 02/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf6a3e6..dd55604 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \ rm -rf /var/cache/apt && \ mkdir /workdir && \ cd /workdir && \ - wget https://developer.arm.com/-/media/Files/downloads/gnu/${VERSION}/binrel/arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz \ + wget https://developer.arm.com/-/media/Files/downloads/gnu/${VERSION}/binrel/arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ tar xvf arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ #wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ #tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ From f83454c2a8901e78044e84e3a5ea520cad5e74ad Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:47:02 +0300 Subject: [PATCH 03/14] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index dd55604..07c85c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \ cmake \ wget \ ca-certificates \ + xz-utils \ -y && \ rm -rf /var/cache/apt && \ mkdir /workdir && \ From 6d36bd8405fb2b33767e9fd4b46096b60ce9c331 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:34:36 +0300 Subject: [PATCH 04/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 107641b..6caa86a 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: arm-none-eabi-gcc --version runs: using: 'docker' - image: 'docker://sergeyladanov/arm-gcc:v12.3.1' + image: 'docker://sergeyladanov/arm-gcc:12.3.rel1' args: - ${{ inputs.command }} From a26154dfd963a9a01502900abf7a276b61208335 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:51:01 +0300 Subject: [PATCH 05/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07c85c0..f474ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \ #tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ rm arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz -RUN echo 'export PATH="/workdir/xarm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc +RUN echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc ADD entrypoint.sh /entrypoint.sh From 6b105450040bfb39cabeb1b8e481c0e7252a83ba Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:26:02 +0300 Subject: [PATCH 06/14] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index f474ad0..2025299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM debian:stable-slim ARG VERSION=12.3.rel1 +ENV ARCH_TAG="---" + RUN ARCH="$(dpkg --print-architecture)" && \ case $ARCH in \ "amd64") \ From be77d0a02c250acd917296d1998d019d9fb7aa70 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:36:15 +0300 Subject: [PATCH 07/14] Update Dockerfile --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2025299..78b6621 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ FROM debian:stable-slim ARG VERSION=12.3.rel1 -ENV ARCH_TAG="---" - RUN ARCH="$(dpkg --print-architecture)" && \ case $ARCH in \ "amd64") \ @@ -30,9 +28,8 @@ RUN ARCH="$(dpkg --print-architecture)" && \ tar xvf arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ #wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ #tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ - rm arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz - -RUN echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc + rm arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ + echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc ADD entrypoint.sh /entrypoint.sh From 7b87c11ccf4929ab4db33324989cd818468b7b9e Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:18:13 +0300 Subject: [PATCH 08/14] Update Dockerfile --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78b6621..36737e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-slim -ARG VERSION=12.3.rel1 +ARG VERSION=11.3.rel1 RUN ARCH="$(dpkg --print-architecture)" && \ case $ARCH in \ @@ -29,7 +29,10 @@ RUN ARCH="$(dpkg --print-architecture)" && \ #wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ #tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \ rm arm-gnu-toolchain-${VERSION}-${ARCH_TAG}-arm-none-eabi.tar.xz && \ - echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc + echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc && \ + apt-get remove ca-certificates xz-utils wget -y && \ + apt autoremove -y && \ + apt autoclean -y && \ ADD entrypoint.sh /entrypoint.sh From 841225f03a7c9f6b24e2e6df99637449100e42dd Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:19:06 +0300 Subject: [PATCH 09/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 6caa86a..5fffded 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: arm-none-eabi-gcc --version runs: using: 'docker' - image: 'docker://sergeyladanov/arm-gcc:12.3.rel1' + image: 'docker://sergeyladanov/arm-gcc:11.3.rel1' args: - ${{ inputs.command }} From fbe647b96a74dde9b06d01ed3c1c74a13b08362e Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:19:55 +0300 Subject: [PATCH 10/14] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25a27ef..02b1cce 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - name: make - uses: embedd-actions/arm-gcc-ci@v12.3.1 + uses: embedd-actions/arm-gcc-ci@11.3.rel1 with: command: make --directory Release all @@ -23,5 +23,5 @@ jobs: ## List of available tags ``` -v12.3.1 +11.3.rel1 ``` From 2a565e354bae53e68e9ebd1963cafdc4bde34b4d Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:27:23 +0300 Subject: [PATCH 11/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 36737e5..5dd9434 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \ echo 'export PATH="/workdir/arm-gnu-toolchain-'${VERSION}'-'${ARCH_TAG}'-arm-none-eabi/bin:$PATH"' >> /etc/bashrc && \ apt-get remove ca-certificates xz-utils wget -y && \ apt autoremove -y && \ - apt autoclean -y && \ + apt autoclean -y ADD entrypoint.sh /entrypoint.sh From e510152a0d34afe7d69a59b0d5d418bbc0359861 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:45:27 +0300 Subject: [PATCH 12/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5dd9434..5588a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-slim -ARG VERSION=11.3.rel1 +ARG VERSION=12.3.rel1 RUN ARCH="$(dpkg --print-architecture)" && \ case $ARCH in \ From d022b3c43b850c77101da1a1eac14409ce445a24 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:45:44 +0300 Subject: [PATCH 13/14] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 5fffded..6caa86a 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: arm-none-eabi-gcc --version runs: using: 'docker' - image: 'docker://sergeyladanov/arm-gcc:11.3.rel1' + image: 'docker://sergeyladanov/arm-gcc:12.3.rel1' args: - ${{ inputs.command }} From bcd9a602943f4db79fabb2b5f4c69c84d3da6d0f Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:46:17 +0300 Subject: [PATCH 14/14] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 02b1cce..dece682 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - name: make - uses: embedd-actions/arm-gcc-ci@11.3.rel1 + uses: embedd-actions/arm-gcc-ci@12.3.rel1 with: command: make --directory Release all @@ -24,4 +24,5 @@ jobs: ``` 11.3.rel1 +12.3.rel1 ```