From 69ca6132b4e2c9921fd2840348a1ee84db5247c0 Mon Sep 17 00:00:00 2001 From: Mathias Brossard Date: Thu, 9 Feb 2023 21:36:03 -0600 Subject: [PATCH] CI: enable GitHub Actions on main branch + doc fixes --- .github/workflows/linux.yml | 2 ++ README.md | 4 +++- docs/hic/README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index cb6b5b728..5e8ee3648 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -2,9 +2,11 @@ name: Build DAPLink (Linux) on: push: branches: + - main - develop pull_request: branches: + - main - develop workflow_dispatch: diff --git a/README.md b/README.md index 7c6126d47..d4f972280 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![DAPLink](/docs/images/daplink-website-logo-link.png)](https://daplink.io/) +[![Linux Build (main)](https://github.com/ARMmbed/DAPLink/actions/workflows/linux.yml/badge.svg?branch=main)](https://github.com/ARMmbed/DAPLink/actions/workflows/linux.yml) [![Linux Build (develop)](https://github.com/ARMmbed/DAPLink/actions/workflows/linux.yml/badge.svg?branch=develop)](https://github.com/ARMmbed/DAPLink/actions/workflows/linux.yml) [![Join us on Slack](https://img.shields.io/static/v1?label=Slack&color=4A154B&logo=slack&style=social&message=Join%20us%20on%20Slack)](https://join.slack.com/t/pyocd/shared_invite/zt-zqjv6zr5-ZfGAXl_mFCGGmFlB_8riHA) @@ -29,6 +30,7 @@ There are many ARM microcontroller-based Hardware Interface Circuits (HICs) that * [Segger J-Link OB based on Atmel SAM3U](https://www.segger.com/products/debug-probes/j-link/models/j-link-ob/) * [STMicroelectronics ST-LINK/V2 (on NUCLEO boards) based on STM32F103CB](https://www.st.com/en/evaluation-tools/stm32-nucleo-boards.html) +You can find more information on the microcontrollers supported [here](docs/hic/README.md). ## Releases There are many board builds (board = HIC + target combination) created from this repository. Quarterly releases will contain new features and bugfixes. Standalone bugfixes are released once reported, verified and fixed. Both quarterly and bugfix releases will result in the build number being incremented. Many development kits and products ship with DAPLink interface firmware or are capable of running DAPLink firmware. **[The current release builds and instructions for updating DAPLink interface firmware is hosted on the DAPLink release site.](https://daplink.io/)** Release notes and previous release builds can be found under GitHub releases. @@ -54,4 +56,4 @@ Information for setting up a development environment, running the tests or creat DAPLink is licensed with the permissive Apache 2.0 license. See the [LICENSE](LICENSE) file for the full text of the license. -Copyright © 2006-2022 Arm Ltd +Copyright © 2006-2023 Arm Ltd diff --git a/docs/hic/README.md b/docs/hic/README.md index 6447e1ab7..fd64a607a 100644 --- a/docs/hic/README.md +++ b/docs/hic/README.md @@ -1,4 +1,4 @@ -# HICs +# Hardware Interface Circuits (HICs) | HIC | Core | Freq. | RAM | ROM | USB | |-------------------------------|:----:|--------:|-------:|-------:|:---:|