Skip to content

Commit 88b5963

Browse files
authored
Merge pull request #48 from xmos/develop
Release v4.3.0 on master
2 parents 39d1297 + 73ee3e6 commit 88b5963

53 files changed

Lines changed: 405 additions & 1108 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/application-note-not-compliant.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/example-not-compliant.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/missing-application-note.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/missing-c-api.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/missing-xcore-test.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/test-not-compliant.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/top-level-readme-not-compliant.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
lib_xassert change log
22
======================
33

4+
4.3.0
5+
-----
6+
7+
* CHANGED: Build examples and tests using XCommon CMake instead of XCommon
8+
* CHANGED: Run tests using pytest
9+
410
4.2.0
511
-----
612

Jenkinsfile

Lines changed: 68 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,83 @@
1-
@Library('xmos_jenkins_shared_library@v0.18.0') _
1+
@Library('xmos_jenkins_shared_library@v0.34.0') _
22

33
getApproval()
44

55
pipeline {
6-
agent {
7-
label 'x86_64&&macOS'
8-
}
6+
agent none
97
environment {
108
REPO = 'lib_xassert'
11-
VIEW = getViewName(REPO)
129
}
1310
options {
11+
buildDiscarder(xmosDiscardBuildSettings())
1412
skipDefaultCheckout()
13+
timestamps()
14+
}
15+
parameters {
16+
string(
17+
name: 'TOOLS_VERSION',
18+
defaultValue: '15.3.0',
19+
description: 'The XTC tools version'
20+
)
21+
string(
22+
name: 'XMOSDOC_VERSION',
23+
defaultValue: 'v6.1.0',
24+
description: 'The xmosdoc version')
1525
}
1626
stages {
17-
stage('Get view') {
18-
steps {
19-
xcorePrepareSandbox("${VIEW}", "${REPO}")
20-
}
21-
}
22-
stage('Library checks') {
23-
steps {
24-
xcoreLibraryChecks("${REPO}")
27+
stage('Build and test') {
28+
agent {
29+
label 'documentation && linux && x86_64'
2530
}
26-
}
27-
stage('Tests') {
28-
steps {
29-
runXmostest("${REPO}", 'tests')
30-
}
31-
}
32-
stage('Build docs') {
33-
steps {
34-
runXdoc("${REPO}/${REPO}/doc")
31+
stages {
32+
stage('Build examples') {
33+
steps {
34+
println "Stage running on ${env.NODE_NAME}"
3535

36-
// Archive all the generated .pdf docs
37-
archiveArtifacts artifacts: "${REPO}/**/pdf/*.pdf", fingerprint: true, allowEmptyArchive: true
38-
}
39-
}
40-
}
41-
post {
42-
success {
43-
updateViewfiles()
44-
}
45-
cleanup {
46-
xcoreCleanSandbox()
47-
}
36+
dir("${REPO}") {
37+
checkout scm
38+
39+
dir("examples") {
40+
withTools(params.TOOLS_VERSION) {
41+
sh 'cmake -G "Unix Makefiles" -B build'
42+
sh 'xmake -C build -j 8'
43+
}
44+
}
45+
} // dir("${REPO}")
46+
} // steps
47+
} // stage('Build examples')
48+
49+
stage('Library Checks') {
50+
steps {
51+
runLibraryChecks("${WORKSPACE}/${REPO}", "v2.0.1")
52+
} // steps
53+
} // stage('Library Checks')
54+
55+
stage('Build Documentation') {
56+
steps {
57+
dir("${REPO}") {
58+
buildDocs()
59+
} // dir("${REPO}")
60+
} // steps
61+
} // stage('Build Documentation')
62+
63+
stage('Simulator tests') {
64+
steps {
65+
dir("${REPO}") {
66+
withTools(params.TOOLS_VERSION) {
67+
createVenv(reqFile: "tests/requirements.txt")
68+
withVenv {
69+
dir("tests") {
70+
sh 'cmake -G "Unix Makefiles" -B build'
71+
sh 'xmake -C build -j 8'
72+
sh "pytest -n auto --junitxml=pytest_result.xml"
73+
}
74+
}
75+
}
76+
}
77+
}
78+
} // stage('Simulator tests')
79+
80+
} // stages
81+
} // stage('Build and test')
4882
}
4983
}

README.rst

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
1-
Lightweight assertions library
2-
==============================
31

2+
:orphan:
3+
4+
###########################################
5+
lib_xassert: Lightweight Assertions Library
6+
###########################################
7+
8+
:vendor: XMOS
9+
:version: 4.3.0
10+
:scope: General Use
11+
:description: Lightweight assertions library
12+
:category: General Purpose
13+
:keywords: debugging, logging
14+
:devices: xcore.ai, xcore-200
15+
16+
********
417
Overview
5-
--------
18+
********
619

720
This library provides a lightweight and flexible replacement for the
821
standard C header ``assert.h``.
@@ -11,14 +24,42 @@ The assertions in this library can be be enabled/disabled
1124
and configured as to how much information they show. This
1225
configuration can be per "xassert unit" (i.e. for sets of files).
1326

27+
********
1428
Features
15-
........
29+
********
30+
31+
Key features of the various components in this repository are as follows
32+
33+
- Low memory usage
34+
35+
- Ability to enable or disable various features via compile time defines
36+
37+
38+
************
39+
Known Issues
40+
************
41+
* None
42+
43+
**************
44+
Required Tools
45+
**************
46+
47+
* XMOS XTC Tools: 15.3.0
48+
49+
*********************************
50+
Required Libraries (dependencies)
51+
*********************************
52+
53+
* None
54+
55+
*************************
56+
Related Application Notes
57+
*************************
1658

17-
* Low memory usage
18-
* Ability to enable or disable various features via compile time defines
59+
* None
1960

20-
Software version and dependencies
21-
.................................
61+
*******
62+
Support
63+
*******
2264

23-
The CHANGELOG contains information about the current and previous versions.
24-
For a list of direct dependencies, look for DEPENDENT_MODULES in lib_xassert/module_build_info.
65+
This package is supported by XMOS Ltd. Issues can be raised against the software at www.xmos.com/support

0 commit comments

Comments
 (0)