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

Updating tool versions #2

Merged
merged 10 commits into from
Jan 28, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build image
run: docker build . -t local
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Log in to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -22,7 +22,7 @@ jobs:
run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

- name: Build container image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
push: true
tags: |
Expand Down
25 changes: 14 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu
FROM ubuntu:23.04

LABEL version="1.0.0"
LABEL version="1.1.0"
LABEL description="Image for building ARM embedded projects"

# Install common tools
Expand All @@ -9,10 +9,10 @@ RUN apt-get install -y \
build-essential \
git \
curl \
wget
wget

# Install CMake
ARG cmake_version="3.20.2"
ARG cmake_version="3.28.1"
ARG cmake_platform="linux-x86_64"

RUN mkdir /opt/cmake
Expand All @@ -21,15 +21,18 @@ RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-li
ENV PATH "$PATH:/opt/cmake/bin"

# Install Python
RUN apt-get install -y python3.9
RUN apt-get install -y python3.11
RUN echo 'alias python="python3.11"' >> ~/.bashrc
RUN echo 'alias python3="python3.11"' >> ~/.bashrc

# ARM GCC configuration
ARG arm_archive="10-2020q4"
ARG arm_version="10-2020-q4-major"
ARG arm_platform="x86_64-linux"
ARG arm_archive="13.2.rel1"
ARG arm_version="13.2.rel1"
ARG arm_folder="13.2.Rel1"
ARG arm_platform="x86_64-arm-none-eabi"

# Install ARM GCC
RUN mkdir /opt/armgcc
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/${arm_archive}/gcc-arm-none-eabi-${arm_version}-${arm_platform}.tar.bz2
RUN tar -xf gcc-arm-none-eabi-${arm_version}-${arm_platform}.tar.bz2 --directory /opt/armgcc
ENV PATH "$PATH:/opt/armgcc/gcc-arm-none-eabi-${arm_version}/bin"
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/${arm_archive}/binrel/arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz
RUN tar -xf arm-gnu-toolchain-${arm_version}-${arm_platform}.tar.xz --directory /opt/armgcc
ENV PATH "$PATH:/opt/armgcc/arm-gnu-toolchain-${arm_folder}-${arm_platform}/bin"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

## Tools

+ CMake 3.20.2
+ Python 3.9
+ CMake 3.28.1
+ Python 3.12
+ GCC 9.0
+ ARM GCC 10.0 (2020 Q4)
+ ARM GCC 13.2-rel1

---

Expand Down