Skip to content

Commit 10e63fd

Browse files
authored
Merge pull request #69 from xmos/release/v3.2.0
Release/v3.2.0
2 parents 5e76ccd + dfbbbb3 commit 10e63fd

File tree

7 files changed

+20
-96
lines changed

7 files changed

+20
-96
lines changed

Brewfile

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

CHANGELOG.rst

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

4+
3.2.0
5+
-----
6+
7+
* ADDED: Support for XCommon CMake build system
8+
49
3.1.1
510
-----
611

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('xmos_jenkins_shared_library@v0.16.2') _
1+
@Library('xmos_jenkins_shared_library@v0.18.0') _
22

33
getApproval()
44

@@ -14,7 +14,7 @@ pipeline {
1414
stages {
1515
stage('Standard build and XS2 tests') {
1616
agent {
17-
label 'x86_64&&brew'
17+
label 'x86_64 && linux'
1818
}
1919
stages{
2020
stage('Get view') {
@@ -71,7 +71,7 @@ pipeline {
7171

7272
stage('xcore.ai Verification'){
7373
agent {
74-
label 'xcore.ai-explorer'
74+
label 'xcore.ai'
7575
}
7676
stages{
7777
stage('Get view') {
@@ -113,7 +113,7 @@ pipeline {
113113

114114
stage('Update view files') {
115115
agent {
116-
label 'x86_64&&brew'
116+
label 'x86_64 && linux'
117117
}
118118
when {
119119
expression { return currentBuild.currentResult == "SUCCESS" }

lib_logging/LICENSE.rst

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

lib_logging/lib_build_info.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
set(LIB_NAME lib_logging)
2+
set(LIB_VERSION 3.2.0)
3+
set(LIB_INCLUDES api)
4+
set(LIB_COMPILER_FLAGS -Os)
5+
set(LIB_DEPENDENT_MODULES "")
6+
set(LIB_OPTIONAL_HEADERS debug_conf.h)
7+
8+
XMOS_REGISTER_MODULE()

lib_logging/module_build_info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = 3.1.1
1+
VERSION = 3.2.0
22

33
DEPENDENT_MODULES =
44

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# pip-install this one as editable using this repository's setup.py file. The
1818
# same modules should appear in the setup.py list as given below.
1919
flake8==3.8.3
20+
# Pin importlib-metadata to <5 due to https://github.com/python/importlib_metadata/issues/409.
21+
importlib-metadata==4.13.0
2022

2123
# Development dependencies
2224
#

0 commit comments

Comments
 (0)