From 89e61453de98cd039f7d342ec3c0544f3a3762e0 Mon Sep 17 00:00:00 2001 From: Dario Messina Date: Fri, 10 Nov 2023 17:56:54 +0100 Subject: [PATCH] Compile up to v2.10 --- .github/workflows/continuous-integration.yaml | 6 +++--- build-scripts/build-in-container.sh | 2 +- build-scripts/continuous-integration.sh | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 2fb325a..84b8e9b 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [v1.00, v1.10, v1.11, v1.20, v1.21, v1.22, v1.23, v1.24, v1.25, v1.26, v1.30, v1.31, v1.32, v1.33, v1.34, v1.35, v1.36, v1.40, v1.41, v1.49, v1.50] + version: [v1.00, v1.10, v1.11, v1.20, v1.21, v1.22, v1.23, v1.24, v1.25, v1.26, v1.30, v1.31, v1.32, v1.33, v1.34, v1.35, v1.36, v1.40, v1.41, v1.49, v1.50, v1.59, v1.60, v1.61, v1.70, v2.00, v2.09, v2.10] target-os: [linux, windows, osx] steps: - name: Install Prerequisites @@ -63,11 +63,11 @@ jobs: name: docker-image-${{ matrix.target-os }}-build path: docker-images - # Version v1.49 cannot be tested because a nonfree XC16 license is required + # Versions v1.49, v1.59, v2.09 cannot be tested because a nonfree XC16 license is required - name: Receive "${{ matrix.target-os }}-test-compile" Docker Image uses: actions/download-artifact@v2 id: download-test-compile-image - if: matrix.version != 'v1.49' + if: matrix.version != 'v1.49' && matrix.version != 'v1.59' && matrix.version != 'v2.09' with: name: docker-image-${{ matrix.target-os }}-test-compile path: docker-images diff --git a/build-scripts/build-in-container.sh b/build-scripts/build-in-container.sh index 02f3dbb..2c65312 100755 --- a/build-scripts/build-in-container.sh +++ b/build-scripts/build-in-container.sh @@ -52,7 +52,7 @@ XC16PLUSPLUS_REVISION=r$(sed -n 's/^XC16PLUSPLUS_REVISION=\([0-9]*\).*/\1/p' bui for TARGET_OS in $*; do - if [ "$XC16_VERSION" == "v1.50" ]; + if xc16ver_ge "v1.50"; then TARGET_OS_WITH_BITS="$TARGET_OS"64 else diff --git a/build-scripts/continuous-integration.sh b/build-scripts/continuous-integration.sh index 752f411..230714d 100755 --- a/build-scripts/continuous-integration.sh +++ b/build-scripts/continuous-integration.sh @@ -49,6 +49,13 @@ set -ex ./build-in-container.sh v1.41 linux windows osx ./build-in-container.sh v1.49 linux windows osx ./build-in-container.sh v1.50 linux windows osx +./build-in-container.sh v1.59 linux windows osx +./build-in-container.sh v1.60 linux windows osx +./build-in-container.sh v1.61 linux windows osx +./build-in-container.sh v1.70 linux windows osx +./build-in-container.sh v2.00 linux windows osx +./build-in-container.sh v2.09 linux windows osx +./build-in-container.sh v2.10 linux windows osx # Compile the tests using the newly-built compilers. # @@ -59,8 +66,8 @@ set -ex # Note: xc16-vN.NN-OS.tar.xz archives must be present in advance! Install XC16 # and use the pack-xc16-binaries.sh tool to create them. # -# Note 2: v1.49 is a "Functional Safety" release whose XC16 executables will not -# run without a specific license. +# Note 2: v1.49, v1.59, v1.09 are "Functional Safety" releases whose XC16 +# executables will not run without a specific license. ./test-compile-in-container.sh v1.00 linux windows osx ./test-compile-in-container.sh v1.10 linux windows osx ./test-compile-in-container.sh v1.11 linux windows osx @@ -82,6 +89,13 @@ set -ex ./test-compile-in-container.sh v1.41 linux windows osx #./test-compile-in-container.sh v1.49 linux windows osx ./test-compile-in-container.sh v1.50 linux windows osx +#./test-compile-in-container.sh v1.59 linux windows osx +./test-compile-in-container.sh v1.60 linux windows osx +./test-compile-in-container.sh v1.61 linux windows osx +./test-compile-in-container.sh v1.70 linux windows osx +./test-compile-in-container.sh v2.00 linux windows osx +#./test-compile-in-container.sh v2.09 linux windows osx +./test-compile-in-container.sh v2.10 linux windows osx # Validate tests #