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.

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

Jump to bottom

Release/0.9.0 #427

Merged
merged 4 commits into from
Aug 27, 2024
Merged

Release/0.9.0 #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75315c5
run-tests.yaml: Fix fuzz step so the "save crashes" step
oyvindronningstad Aug 22, 2024
642aaab
zcbor.py: Accept files without path
oyvindronningstad Aug 22, 2024
4c31d03
zcbor.py: Fix generated comment so it passes Zephyr's checkpatch
oyvindronningstad Aug 27, 2024
47f34dd
Update version to 0.9.0
oyvindronningstad May 8, 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
25 changes: 20 additions & 5 deletions .github/workflows/run-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:

release-test-1:
runs-on: ubuntu-22.04
name: Release tests 1 - Fuzz
name: Release tests 1 - Check versions
needs:
- merge-test-1
- merge-test-1-win
Expand All @@ -193,6 +193,21 @@ jobs:
python3 -m unittest test_versions
rm HEAD_REF

release-test-2:
runs-on: ubuntu-22.04
name: Release tests 2 - Fuzz
needs:
- release-test-1
steps:
- name: Checkout the code
uses: actions/checkout@v4

- name: Read zcbor version
run: echo "ZCBOR_VERSION=$(cat zcbor/VERSION)" >> $GITHUB_ENV

- name: Install zcbor
uses: ./.github/actions/install_zcbor

- name: Install packages
run: |
sudo apt update
Expand Down Expand Up @@ -232,13 +247,13 @@ jobs:
name: zcbor-release-$ZCBOR_VERSION
path: dist/*

release-test-2:
release-test-3:
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
asserts: ["", "-x VERBOSE=ON -x ASSERTS=ON"]
name: Release tests 2 (Python ${{ matrix.python-version }}${{ matrix.asserts != '' && ' with asserts' || '' }})
name: Release tests 3 (Python ${{ matrix.python-version }}${{ matrix.asserts != '' && ' with asserts' || '' }})
needs:
- merge-test-1
- merge-test-1-win
Expand Down Expand Up @@ -268,13 +283,13 @@ jobs:
zephyr_toolchain: zephyr
zephyr_toolchain_arch: arm,mips

release-test-3:
release-test-4:
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
asserts: ["", "-x VERBOSE=ON -x ASSERTS=ON"]
name: Release tests 3 (Python ${{ matrix.python-version }}${{ matrix.asserts != '' && ' with asserts' || '' }})
name: Release tests 4 (Python ${{ matrix.python-version }}${{ matrix.asserts != '' && ' with asserts' || '' }})
needs:
- merge-test-1
- merge-test-1-win
Expand Down
2 changes: 1 addition & 1 deletion MIGRATION_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# zcbor v. 0.8.99
# zcbor v. 0.9.0

* `zcbor_simple_*()` functions have been removed to avoid confusion about their use.
They are still in the C file because they are used by other functions.
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# zcbor v. 0.8.99
# zcbor v. 0.9.0 (2024-08-27)

Any new bugs, requests, or missing features should be reported as [Github issues](https://github.com/NordicSemiconductor/zcbor/issues).

Expand Down
4 changes: 2 additions & 2 deletions include/zcbor_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ extern "C" {
#define ZCBOR_STRINGIFY(s) ZCBOR_STRINGIFY_PRE(s)

#define ZCBOR_VERSION_MAJOR 0
#define ZCBOR_VERSION_MINOR 8
#define ZCBOR_VERSION_BUGFIX 99
#define ZCBOR_VERSION_MINOR 9
#define ZCBOR_VERSION_BUGFIX 0

/** The version string with dots and not prefix. */
#define ZCBOR_VERSION_STR ZCBOR_STRINGIFY(ZCBOR_VERSION_MAJOR) \
Expand Down
2 changes: 1 addition & 1 deletion samples/pet/include/pet_decode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*
* Generated using zcbor version 0.8.99
* Generated using zcbor version 0.9.0
* https://github.com/NordicSemiconductor/zcbor
* Generated with a --default-max-qty of 3
*/
Expand Down
2 changes: 1 addition & 1 deletion samples/pet/include/pet_encode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*
* Generated using zcbor version 0.8.99
* Generated using zcbor version 0.9.0
* https://github.com/NordicSemiconductor/zcbor
* Generated with a --default-max-qty of 3
*/
Expand Down
2 changes: 1 addition & 1 deletion samples/pet/include/pet_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*
* Generated using zcbor version 0.8.99
* Generated using zcbor version 0.9.0
* https://github.com/NordicSemiconductor/zcbor
* Generated with a --default-max-qty of 3
*/
Expand Down
2 changes: 1 addition & 1 deletion samples/pet/pet.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# Generated using zcbor version 0.8.99
# Generated using zcbor version 0.9.0
# https://github.com/NordicSemiconductor/zcbor
# Generated with a --default-max-qty of 3
#
Expand Down
5 changes: 3 additions & 2 deletions samples/pet/src/pet_decode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*
* Generated using zcbor version 0.8.99
* Generated using zcbor version 0.9.0
* https://github.com/NordicSemiconductor/zcbor
* Generated with a --default-max-qty of 3
*/
Expand Down Expand Up @@ -46,7 +46,8 @@ static bool decode_Pet(

if (false) {
/* For testing that the types of the arguments are correct.
A compiler error here means a bug in zcbor. */
* A compiler error here means a bug in zcbor.
*/
zcbor_tstr_decode(state, (*&(*result).names));
}

Expand Down
2 changes: 1 addition & 1 deletion samples/pet/src/pet_encode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*
* Generated using zcbor version 0.8.99
* Generated using zcbor version 0.9.0
* https://github.com/NordicSemiconductor/zcbor
* Generated with a --default-max-qty of 3
*/
Expand Down
2 changes: 1 addition & 1 deletion zcbor/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.99
0.9.0
5 changes: 3 additions & 2 deletions zcbor/zcbor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,8 @@ def render_function(self, xcoder, mode):
arg_test = f"""
if (false) {{
/* For testing that the types of the arguments are correct.
A compiler error here means a bug in zcbor. */
* A compiler error here means a bug in zcbor.
*/
{calls}
}}
"""
Expand Down Expand Up @@ -2959,7 +2960,7 @@ def render(self, modes, h_files, c_files, type_file, include_prefix, cmake_file=
h_name = Path(include_prefix, Path(h_files[mode].name).name)

# Create and populate the generated c and h file.
makedirs(path.dirname(c_files[mode].name), exist_ok=True)
makedirs(path.dirname(Path(c_files[mode].name).absolute()), exist_ok=True)

type_def_name = Path(include_prefix, Path(type_file.name).name)

Expand Down