Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit: using new arm gcc and update docs #27

Merged
merged 1 commit into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- main
paths-ignore:
- '**.md'
workflow_dispatch:

env:
TEST_REPO_URL: https://github.com/jasonyang-ee/STM32-CMAKE-TEMPLATE.git
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ jobs:
with:
images: |
${{ secrets.DOCKERHUB_USERNAME }}/stm32-builder
${{ vars.REGISTRY }}/stm32-builder
ghcr.io/${{ github.actor }}/stm32-builder
tags: type=ref,event=tag
flavor: prefix=${{ matrix.files }}-,onlatest=true

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
username: ${{ secrets.USERNAME_DOCKERHUB }}
password: ${{ secrets.TOKEN_DOCKERHUB }}

- name: Log in to Github Container Registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ vars.REGISTRY }}
username: ${{ secrets.USER_GITHUB_PERSONAL }}
password: ${{ secrets.TOKEN_GITHUB_PERSONAL }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.TOKEN_GITHUB }}

# - uses: actions/delete-package-versions@v4
# with:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=$TARGETPLATFORM alpine:3.17
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TOOLS_PATH=/opt/gcc-arm-none-eabi
ARG ARM_VERSION=12.3.rel1
ARG ARM_VERSION=13.3.rel1

RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log

Expand All @@ -22,7 +22,7 @@ RUN apk update && apk add --no-cache --virtual build-dependencies \
# Get ARM Toolchain
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then export ARM_ARCH=x86_64; \
else export ARM_ARCH=aarch64; \
fi \
fi \
&& echo "Downloading ARM GNU GCC for Platform: $ARM_ARCH" \
&& mkdir ${TOOLS_PATH} \
&& curl -Lo gcc-arm-none-eabi.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu/${ARM_VERSION}/binrel/arm-gnu-toolchain-${ARM_VERSION}-${ARM_ARCH}-arm-none-eabi.tar.xz" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.arch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=$TARGETPLATFORM archlinux:base-devel
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TOOLS_PATH=/opt/gcc-arm-none-eabi
ARG ARM_VERSION=12.3.rel1
ARG ARM_VERSION=13.3.rel1

# Prep basic packages
RUN pacman -Syy
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=$TARGETPLATFORM debian:bookworm-slim
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TOOLS_PATH=/opt/gcc-arm-none-eabi
ARG ARM_VERSION=12.3.rel1
ARG ARM_VERSION=13.3.rel1

RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log

Expand All @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y \
# Get ARM Toolchain
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then export ARM_ARCH=x86_64; \
else export ARM_ARCH=aarch64; \
fi \
fi \
&& echo "Downloading ARM GNU GCC for Platform: $ARM_ARCH" \
&& mkdir ${TOOLS_PATH} \
&& curl -Lo gcc-arm-none-eabi.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu/${ARM_VERSION}/binrel/arm-gnu-toolchain-${ARM_VERSION}-${ARM_ARCH}-arm-none-eabi.tar.xz" \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM --platform=$TARGETPLATFORM ubuntu:22.04
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG TOOLS_PATH=/opt/gcc-arm-none-eabi
ARG ARM_VERSION=12.3.rel1
ARG ARM_VERSION=13.3.rel1


RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log

Expand All @@ -18,7 +19,7 @@ RUN apt-get update && apt-get install -y \
# Get ARM Toolchain
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then export ARM_ARCH=x86_64; \
else export ARM_ARCH=aarch64; \
fi \
fi \
&& echo "Downloading ARM GNU GCC for Platform: $ARM_ARCH" \
&& mkdir ${TOOLS_PATH} \
&& curl -Lo gcc-arm-none-eabi.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu/${ARM_VERSION}/binrel/arm-gnu-toolchain-${ARM_VERSION}-${ARM_ARCH}-arm-none-eabi.tar.xz" \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
- `7.1`: Bug fixs. Help menu update.
- `7.2`: Typo fixs.
- `7.3`: Move TLS bypass to top and apply to all situations.
- `Latest`: `7.3`
- `7.4`: Using new ARM GCC 13.3.rel1.
- `Latest`: `7.4`



Expand Down
2 changes: 1 addition & 1 deletion docs_src/page/Docker_Build.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you choose to build your own image from Dockerfile.

*<https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads/>*

- Modify `ARM_VERSION=12.2.rel1` for enforcing compiler version.
- Modify `ARM_VERSION=13.3.rel1` for enforcing compiler version.

- If pulling latest version is desired, insert this line before `curl` command in dockerfile.

Expand Down
Loading