Skip to content

Commit

Permalink
Prepare for CI to move to OpenWrt 23.05.3 (#16)
Browse files Browse the repository at this point in the history
* Prepare for CI to move to OpenWrt 23.05.3

* Don't prepend STAGING_DIR_HOST to PATH

This causes the OpenWrt prereq-build step to get confused since it is looking
for host binaries on PATH and then symlinks them into that directory.
  • Loading branch information
ksperling-apple authored May 21, 2024
1 parent 51ec09b commit 9031f64
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .containers/matter-openwrt-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
ARG OPENWRT_VERSION=22.03.5
ARG OPENWRT_VERSION=23.05.3
FROM ghcr.io/openwrt/sdk:x86-generic-${OPENWRT_VERSION}
LABEL org.opencontainers.image.description="Pre-warmed OpenWrt SDK"

# Core packages to pre-build to speed up CI builds
ARG SRC_PACKAGES="glib2 openssl ubus"
ARG CFG_PACKAGES="glib2 libopenssl libubus"

# Add host tools from WORKDIR (/builder) to PATH
ENV PATH="/builder/staging_dir/host/bin:$PATH"
RUN set -x && \
grep -w 'base\|packages' feeds.conf.default > feeds.conf && \
./scripts/feeds update -a && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Build
uses: addnab/docker-run-action@v3
with:
image: ghcr.io/project-chip/matter-openwrt-build:latest
image: ghcr.io/project-chip/matter-openwrt-build:22.03.5
options: --volume ${{ github.workspace }}:/workspace
shell: bash
run: |
Expand Down

0 comments on commit 9031f64

Please sign in to comment.