Skip to content

update test images #2732

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.

Sign up for GitHub

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

Merged
rminnich merged 1 commit into from
Jul 27, 2023
Merged

update test images #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:

test-build-tamago-arm:
docker:
- image: uroottest/test-image-tamago:v4.4.0
- image: uroottest/test-image-tamago:v4.5.0
working_directory: /home/circleci/go/src/github.com/u-root/u-root
environment:
- UROOT_SOURCE: /home/circleci/go/src/github.com/u-root/u-root
Expand All @@ -125,7 +125,7 @@ jobs:

test-build-tamago-riscv64:
docker:
- image: uroottest/test-image-tamago:v4.4.0
- image: uroottest/test-image-tamago:v4.5.0
working_directory: /home/circleci/go/src/github.com/u-root/u-root
environment:
- UROOT_SOURCE: /home/circleci/go/src/github.com/u-root/u-root
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/builduploadall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

VERSION=v4.4.0
VERSION=v4.5.0

VC=$(git diff --exit-code builduploadall.sh | grep --no-ignore-case -P "VERSION=+" | wc -l)
echo $vc
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/test-image-arm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN sudo apt-get update && \
libpixman-1-dev \
meson \
ninja-build \
python \
python3 \
zlib1g-dev \
`# Linux kernel build deps` \
libelf-dev && \
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/test-image-tamago/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ RUN apt-get install -y cmake gcc gcc-arm-none-eabi gcc-mingw-w64 git gzip \
u-boot-tools vim wget

# install tamago-go
ENV TAMAGO_VERSION="1.20.3"
ENV TAMAGO_CHECKSUM="7657d39b8e062f85433a48367012d138ef5b928408b0b41e15384fe150495082"
ENV TAMAGO_VERSION="1.20.6"
ENV TAMAGO_CHECKSUM="6319b1778e93695b62bb63946c5dd28c4d8f3c1ac3c4bf28e49cb967d570dfd5"
RUN wget -O tamago-go.tgz https://github.com/usbarmory/tamago-go/releases/download/tamago-go${TAMAGO_VERSION}/tamago-go${TAMAGO_VERSION}.linux-amd64.tar.gz
RUN echo "${TAMAGO_CHECKSUM} tamago-go.tgz" | sha256sum --strict --check -
RUN tar -C / -xzf tamago-go.tgz && rm tamago-go.tgz
Expand Down