Merge pull request #69 from xmos/release/v3.2.0

Release/v3.2.0
xmos · Feb 16, 2024 · 10e63fd · 10e63fd
2 parents 5e76ccd + dfbbbb3
commit 10e63fd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 96 deletions.
diff --git a/Brewfile b/Brewfile
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Logging change log
 ==================
 
+3.2.0
+-----
+
+  * ADDED:   Support for XCommon CMake build system
+
 3.1.1
 -----
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('xmos_jenkins_shared_library@v0.16.2') _
+@Library('xmos_jenkins_shared_library@v0.18.0') _
 
 getApproval()
 
@@ -14,7 +14,7 @@ pipeline {
   stages {
     stage('Standard build and XS2 tests') {
       agent {
-        label 'x86_64&&brew'
+        label 'x86_64 && linux'
       }
       stages{
         stage('Get view') {
@@ -71,7 +71,7 @@ pipeline {
 
     stage('xcore.ai Verification'){
       agent {
-        label 'xcore.ai-explorer'
+        label 'xcore.ai'
       }
       stages{
         stage('Get view') {
@@ -113,7 +113,7 @@ pipeline {
 
     stage('Update view files') {
       agent {
-        label 'x86_64&&brew'
+        label 'x86_64 && linux'
       }
       when {
         expression { return currentBuild.currentResult == "SUCCESS" }

diff --git a/lib_logging/LICENSE.rst b/lib_logging/LICENSE.rst
diff --git a/lib_logging/lib_build_info.cmake b/lib_logging/lib_build_info.cmake
@@ -0,0 +1,8 @@
+set(LIB_NAME lib_logging)
+set(LIB_VERSION 3.2.0)
+set(LIB_INCLUDES api)
+set(LIB_COMPILER_FLAGS -Os)
+set(LIB_DEPENDENT_MODULES "")
+set(LIB_OPTIONAL_HEADERS debug_conf.h)
+
+XMOS_REGISTER_MODULE()
diff --git a/lib_logging/module_build_info b/lib_logging/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 3.1.1
+VERSION = 3.2.0
 
 DEPENDENT_MODULES =
 

diff --git a/requirements.txt b/requirements.txt
@@ -17,6 +17,8 @@
 # pip-install this one as editable using this repository's setup.py file.  The
 # same modules should appear in the setup.py list as given below.
 flake8==3.8.3
+# Pin importlib-metadata to <5 due to https://github.com/python/importlib_metadata/issues/409.
+importlib-metadata==4.13.0
 
 # Development dependencies
 #