diff --git a/Dockerfile b/Dockerfile index 7e5c147..5588a6c 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 @@ -19,15 +19,20 @@ RUN ARCH="$(dpkg --print-architecture)" && \ cmake \ wget \ ca-certificates \ + xz-utils \ -y && \ 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 - -RUN echo 'export PATH="/workdir/xpack-arm-none-eabi-gcc-'${VERSION}'/bin:$PATH"' >> /etc/bashrc + 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 && \ + 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 diff --git a/README.md b/README.md index 25a27ef..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@v12.3.1 + uses: embedd-actions/arm-gcc-ci@12.3.rel1 with: command: make --directory Release all @@ -23,5 +23,6 @@ jobs: ## List of available tags ``` -v12.3.1 +11.3.rel1 +12.3.rel1 ``` 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 }}