Skip to content

misc: add vanilla-zephyr containers for v3.7.1 and v4.0.0 #8

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
MarkoSagadin merged 2 commits into from
Dec 20, 2024
Merged

misc: add vanilla-zephyr containers for v3.7.1 and v4.0.0 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d4baa
misc: configure containers for v3.7.1 and v4.0.0
Finwood Dec 2, 2024
6cdd5b1
docs: add CHANGELOG entry
Finwood Dec 2, 2024
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
9 changes: 9 additions & 0 deletions .github/workflows/build-and-publish-vanilla-zephyr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ jobs:
matrix:
variant:
- zephyr_version: "v3.6.0"
zephyr_sdk_version: "0.16.8"
mcuboot_version: "a4eda30f5b0cfd0cf15512be9dcd559239dbfc91"
- zephyr_version: "v3.7.1"
zephyr_sdk_version: "0.16.9"
mcuboot_version: "ea2410697dd0262edec041a0ccb07fdbde7c1aff"
- zephyr_version: "v4.0.0"
zephyr_sdk_version: "0.17.0"
mcuboot_version: "f74b77cf7808919837c0ed14c2ead3918c546349"

steps:
- name: Checkout repository
Expand Down Expand Up @@ -54,6 +61,7 @@ jobs:
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci:latest
build-args: |
ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
ZEPHYR_SDK_VERSION=${{ matrix.variant.zephyr_sdk_version }}
MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}

- name: Build and push Dev image
Expand All @@ -68,5 +76,6 @@ jobs:
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-dev:latest
build-args: |
ZEPHYR_VERSION=${{ matrix.variant.zephyr_version }}
ZEPHYR_SDK_VERSION=${{ matrix.variant.zephyr_sdk_version }}
MCUBOOT_VERSION=${{ matrix.variant.mcuboot_version }}
BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.variant.zephyr_version }}-ci:${{ inputs.release_version }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]

### Added

- Add support for Zephyr v3.7.1 (LTS) and v4.0.0.

## [1.9.0] - 2024-11-20

### Added
Expand Down
6 changes: 4 additions & 2 deletions vanilla-zephyr/build_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#! /usr/bin/env bash
ZEPHYR_VERSION=v3.6.0
MCUBOOT_VERSION=a4eda30f5b0cfd0cf15512be9dcd559239dbfc91
ZEPHYR_VERSION=v3.7.1
ZEPHYR_SDK_VERSION=0.16.9
MCUBOOT_VERSION=ea2410697dd0262edec041a0ccb07fdbde7c1aff

docker build \
--build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \
--build-arg "ZEPHYR_SDK_VERSION=$ZEPHYR_SDK_VERSION" \
--build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \
-f "Dockerfile.ci" \
-t "irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest" .
6 changes: 4 additions & 2 deletions vanilla-zephyr/build_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#! /usr/bin/env bash
ZEPHYR_VERSION=v3.6.0
MCUBOOT_VERSION=a4eda30f5b0cfd0cf15512be9dcd559239dbfc91
ZEPHYR_VERSION=v3.7.1
ZEPHYR_SDK_VERSION=0.16.9
MCUBOOT_VERSION=ea2410697dd0262edec041a0ccb07fdbde7c1aff
BASE_IMAGE="irnas/vanilla-zephyr-$ZEPHYR_VERSION-ci:latest"

docker build \
--build-arg "ZEPHYR_VERSION=$ZEPHYR_VERSION" \
--build-arg "ZEPHYR_SDK_VERSION=$ZEPHYR_SDK_VERSION" \
--build-arg "MCUBOOT_VERSION=$MCUBOOT_VERSION" \
--build-arg "BASE_IMAGE=$BASE_IMAGE" \
-f "Dockerfile.dev" \
Expand Down