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

refactor: Updated SDK and Zephyr versions #147

Merged
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
27 changes: 14 additions & 13 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Containers

env:
zephyr-version: 3.2.0
zephyr-sdk-version: 0.15.2
zephyr-version: 3.5.0
zephyr-sdk-version: 0.16.3
sha-abbrev-length: 12
no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }}
Expand Down Expand Up @@ -185,9 +185,10 @@ jobs:
runs-on: ubuntu-latest
env:
docker-args: --rm --workdir /github/workspace -v /var/run/docker.sock:/var/run/docker.sock -v /home/runner/work/_temp:/home/runner/work/_temp -v /home/runner/work/_temp/_github_home:/github/home -v /home/runner/work/_temp/_github_workflow:/github/workflow -v /home/runner/work/_temp/_runner_file_commands:/github/file_commands -v ${{ github.workspace }}:/github/workspace
container-id: ${{ github.run_id }}_${{ github.run_number}}
defaults:
run:
shell: /usr/bin/docker exec candidate /bin/bash {0}
shell: /usr/bin/docker exec ${{ env.container-id }} /bin/bash {0}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -350,7 +351,7 @@ jobs:
${{ runner.os }}/${{ env.cache-name }}/
- name: Create and run container from 'build' candidate image
shell: bash
run: docker run -d -it --name candidate ${{ env.docker-args }} ${{ steps.paths.outputs.build-candidate }}
run: docker run -d -it --name ${{ env.container-id }} ${{ env.docker-args }} ${{ steps.paths.outputs.build-candidate }}
- name: Fixes for git safety checks
run: git config --global --add safe.directory '*'
- name: Test cmake
Expand Down Expand Up @@ -385,10 +386,10 @@ jobs:
run: west build -t clean
- name: Stop container
shell: bash
run: docker stop candidate
run: docker stop ${{ env.container-id }}; sleep 5
- name: Create and run container from 'dev' candidate image
shell: bash
run: docker run -d -it --name candidate ${{ env.docker-args }} ${{ steps.paths.outputs.dev-candidate }}
run: docker run -d -it --name ${{ env.container-id }} ${{ env.docker-args }} ${{ steps.paths.outputs.dev-candidate }}
- name: Test clang-format
run: clang-format --version
- name: Test node
Expand All @@ -401,17 +402,16 @@ jobs:
run: cd docs && npm run prettier:check
- name: Test docs start (webpack-dev-server)
run: cd docs && timeout -s SIGINT 60 npm run start &
- run: sleep 15
- name: Test docs wget (webpack-dev-server)
run: wget http://localhost:3000
- run: sleep 10
id: wget-webpack-dev-server
run: wget --waitretry=60 http://localhost:3000
- run: sleep 60
- name: Test docs build (webpack)
run: cd docs && npm run build
- name: Test docs serve (webpack)
run: cd docs && timeout -s SIGINT 10 npm run serve &
- run: sleep 5
run: cd docs && timeout -s SIGINT 30 npm run serve &
- name: Test docs wget (webpack)
run: wget http://localhost:3000
run: wget --waitretry=30 http://localhost:3000
- name: Test less
run: less --version
- name: Test PAGER
Expand All @@ -429,7 +429,8 @@ jobs:
run: socat -V
- name: Stop container
shell: bash
run: docker stop candidate
run: docker stop ${{ env.container-id }}
if: ${{ always() }}
- name: Build and push 'build' candidate image (x86_64 and arm64)
if: ${{ steps.docker-hub-login.outcome == 'success' }}
uses: docker/build-push-action@v3
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ RUN \
wget \
xz-utils \
&& cd ${TMP} \
&& wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${minimal_sdk_file_name}.tar.gz" \
&& tar xvfz ${minimal_sdk_file_name}.tar.gz \
&& wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${minimal_sdk_file_name}.tar.xz" \
&& tar xvfJ ${minimal_sdk_file_name}.tar.xz \
&& mv zephyr-sdk-${ZEPHYR_SDK_VERSION} /opt/ \
&& rm ${minimal_sdk_file_name}.tar.gz \
&& rm ${minimal_sdk_file_name}.tar.xz \
&& cd /opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
&& ./setup.sh -h -c -t ${ARCHITECTURE}${arch_sep}zephyr-${arch_format} \
&& cd \
Expand Down
8 changes: 4 additions & 4 deletions architectures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
- x86_64
- xtensa-espressif_esp32
- xtensa-espressif_esp32s2
- xtensa-intel_apl_adsp
- xtensa-intel_bdw_adsp
- xtensa-intel_byt_adsp
- xtensa-intel_s1000
- xtensa-espressif_esp32s3
- xtensa-intel_tgl_adsp
- xtensa-intel_ace15_mtpm
- xtensa-mtk_mt8195_adsp
- xtensa-nxp_imx8m_adsp
- xtensa-nxp_imx_adsp
- xtensa-sample_controller