diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index ca56b41b..bad67773 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -16,11 +16,12 @@ jobs: - uses: actions/checkout@v4 with: { fetch-depth: 2 } - run: test/setup_ga_docker_filesystem.sh - - run: make -C tutorials/zephyr init REPO=zephyrprojectrtos/ci REVNO="${{ matrix.revno }}" + - run: make -C tutorials/zephyr init REPO=zephyrprojectrtos/ci:v0.28.8 REVNO="${{ matrix.revno }}" - run: make -C tutorials/zephyr minify REVNO="${{ matrix.revno }}" - run: make -C tutorials/zephyr update - - run: make -C tutorials/zephyr/device-dashboard build - - run: make -C tutorials/zephyr/http-client build - - run: make -C tutorials/zephyr/http-server build - - run: make -C tutorials/zephyr/mqtt-aws-client build - - run: make -C tutorials/zephyr/websocket-server build + - run: make -C tutorials/zephyr/device-dashboard build REPO=zephyrprojectrtos/ci:v0.28.8 + - run: make -C tutorials/zephyr/http-client build REPO=zephyrprojectrtos/ci:v0.28.8 + - run: make -C tutorials/zephyr/http-server build REPO=zephyrprojectrtos/ci:v0.28.8 + - run: make -C tutorials/zephyr/mqtt-aws-client build REPO=zephyrprojectrtos/ci:v0.28.8 + - run: make -C tutorials/zephyr/websocket-server build REPO=zephyrprojectrtos/ci:v0.28.8 +# Latest CI image does not work with pre 4.4, they changed some SDK paths diff --git a/tutorials/zephyr/device-dashboard/Makefile b/tutorials/zephyr/device-dashboard/Makefile index bce4134f..f77cb2f6 100644 --- a/tutorials/zephyr/device-dashboard/Makefile +++ b/tutorials/zephyr/device-dashboard/Makefile @@ -1,10 +1,11 @@ TOP_DIR ?= $(realpath $(CURDIR)/../../..) ZEPHYR_DIR ?= $(realpath $(CURDIR)/..)/zephyrproject +REPO ?= zephyrprojectrtos/ci DOCKER ?= docker run --rm \ -v $(TOP_DIR):$(TOP_DIR) \ -w $(realpath $(CURDIR)) \ -e ZEPHYR_BASE=$(ZEPHYR_DIR)/zephyr \ - $(DOCKER_ARGS) zephyrprojectrtos/ci + $(DOCKER_ARGS) $(REPO) BUILD_ARGS ?= -b nucleo_f746zg .PHONY: build diff --git a/tutorials/zephyr/http-client/Makefile b/tutorials/zephyr/http-client/Makefile index e5571523..ee271b2c 100644 --- a/tutorials/zephyr/http-client/Makefile +++ b/tutorials/zephyr/http-client/Makefile @@ -1,10 +1,11 @@ TOP_DIR ?= $(realpath $(CURDIR)/../../..) ZEPHYR_DIR ?= $(realpath $(CURDIR)/..)/zephyrproject +REPO ?= zephyrprojectrtos/ci DOCKER ?= docker run --rm \ -v $(TOP_DIR):$(TOP_DIR) \ -w $(realpath $(CURDIR)) \ -e ZEPHYR_BASE=$(ZEPHYR_DIR)/zephyr \ - $(DOCKER_ARGS) zephyrprojectrtos/ci + $(DOCKER_ARGS) $(REPO) BUILD_ARGS ?= -b nucleo_f746zg .PHONY: build diff --git a/tutorials/zephyr/http-server/Makefile b/tutorials/zephyr/http-server/Makefile index e5571523..ee271b2c 100644 --- a/tutorials/zephyr/http-server/Makefile +++ b/tutorials/zephyr/http-server/Makefile @@ -1,10 +1,11 @@ TOP_DIR ?= $(realpath $(CURDIR)/../../..) ZEPHYR_DIR ?= $(realpath $(CURDIR)/..)/zephyrproject +REPO ?= zephyrprojectrtos/ci DOCKER ?= docker run --rm \ -v $(TOP_DIR):$(TOP_DIR) \ -w $(realpath $(CURDIR)) \ -e ZEPHYR_BASE=$(ZEPHYR_DIR)/zephyr \ - $(DOCKER_ARGS) zephyrprojectrtos/ci + $(DOCKER_ARGS) $(REPO) BUILD_ARGS ?= -b nucleo_f746zg .PHONY: build diff --git a/tutorials/zephyr/mqtt-aws-client/Makefile b/tutorials/zephyr/mqtt-aws-client/Makefile index e5571523..ee271b2c 100644 --- a/tutorials/zephyr/mqtt-aws-client/Makefile +++ b/tutorials/zephyr/mqtt-aws-client/Makefile @@ -1,10 +1,11 @@ TOP_DIR ?= $(realpath $(CURDIR)/../../..) ZEPHYR_DIR ?= $(realpath $(CURDIR)/..)/zephyrproject +REPO ?= zephyrprojectrtos/ci DOCKER ?= docker run --rm \ -v $(TOP_DIR):$(TOP_DIR) \ -w $(realpath $(CURDIR)) \ -e ZEPHYR_BASE=$(ZEPHYR_DIR)/zephyr \ - $(DOCKER_ARGS) zephyrprojectrtos/ci + $(DOCKER_ARGS) $(REPO) BUILD_ARGS ?= -b nucleo_f746zg .PHONY: build diff --git a/tutorials/zephyr/websocket-server/Makefile b/tutorials/zephyr/websocket-server/Makefile index e5571523..ee271b2c 100644 --- a/tutorials/zephyr/websocket-server/Makefile +++ b/tutorials/zephyr/websocket-server/Makefile @@ -1,10 +1,11 @@ TOP_DIR ?= $(realpath $(CURDIR)/../../..) ZEPHYR_DIR ?= $(realpath $(CURDIR)/..)/zephyrproject +REPO ?= zephyrprojectrtos/ci DOCKER ?= docker run --rm \ -v $(TOP_DIR):$(TOP_DIR) \ -w $(realpath $(CURDIR)) \ -e ZEPHYR_BASE=$(ZEPHYR_DIR)/zephyr \ - $(DOCKER_ARGS) zephyrprojectrtos/ci + $(DOCKER_ARGS) $(REPO) BUILD_ARGS ?= -b nucleo_f746zg .PHONY: build