Skip to content

Commit

Permalink
[buildmgr] Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
grasci-arm authored Nov 15, 2022
1 parent ff88934 commit 91d8e42
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tools/buildmgr/cbuildgen/installer/create_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cp -R ../config/. ${distdir}/etc
cp ../../docs/LICENSE.txt ${distdir}

# Get cpackget
cpackget_version="0.8.2"
cpackget_version="0.8.5"
cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${distdir}/bin/cpackget.lin-amd64
curl --retry 3 -L ${cpackget_base}_windows_amd64.zip -o temp.zip && unzip -p temp.zip '*/cpackget.exe' > ${distdir}/bin/cpackget.exe-amd64 && rm temp.zip
Expand All @@ -71,7 +71,7 @@ curl --retry 3 -L ${cpackget_base}_linux_arm64.tar.gz -o - | tar xzfO - --wildc
#curl --retry 3 -L ${cpackget_base}_darwin_arm64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${distdir}/bin/cpackget.mac-arm64

# Get cbuild
cbuild_version="1.2.0"
cbuild_version="1.3.0"
cbuild_base=https://github.com/Open-CMSIS-Pack/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
curl --retry 3 -L ${cbuild_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cbuild' > ${distdir}/bin/cbuild.lin-amd64
curl --retry 3 -L ${cbuild_base}_windows_amd64.zip -o temp.zip && unzip -p temp.zip '*/cbuild.exe' > ${distdir}/bin/cbuild.exe-amd64 && rm temp.zip
Expand Down
4 changes: 2 additions & 2 deletions tools/buildmgr/cbuildgen/installer/make_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ mkdir -p etc/${PACKAGE_NAME}
mkdir -p etc/profile.d

# Get cpackget
cpackget_version="0.8.2"
cpackget_version="0.8.5"
cpackget_base=https://github.com/Open-CMSIS-Pack/cpackget/releases/download/v${cpackget_version}/cpackget_${cpackget_version}
curl --retry 3 -L ${cpackget_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cpackget' > ${input}/bin/cpackget.lin-amd64

# Get cbuild
cbuild_version="1.2.0"
cbuild_version="1.3.0"
cbuild_base=https://github.com/Open-CMSIS-Pack/cbuild/releases/download/v${cbuild_version}/cbuild_${cbuild_version}
curl --retry 3 -L ${cbuild_base}_linux_amd64.tar.gz -o - | tar xzfO - --wildcards '*cbuild' > ${input}/bin/cbuild.lin-amd64

Expand Down
10 changes: 10 additions & 0 deletions tools/buildmgr/docs/doxygen/Build/src/General.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ Software layers and Virtual I/O simplify these use cases:
<th>Description</th>
</tr>
<tr>
<td>1.3.0</td>
<td>Release for review of initial development:
- updated cbuild utility v1.3.0
- updated cpackget utility v0.8.5
- added compiler abstractions mappings
- added 'ldcflag' and 'ldcxxflag' handling
- added support for branch protection
- added support for 'linux-arm64' host platform​
- added support for toolchain environment variables
</td>
<td>1.2.0</td>
<td>Release for review of initial development:
- updated cbuild utility v1.2.0.
Expand Down
4 changes: 2 additions & 2 deletions tools/buildmgr/test/integrationtests/src/CPackGetTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ TEST_F(CPackGetTests, PackAddPackInstallationTest) {

// Install pack with missing build environment
TEST_F(CPackGetTests, PackAddNoEnvValidArgTest) {
TestParam param = { "", "pack.cpinstall", "", "", false };
TestParam param = { "", "pack.cpinstall", "", "", true };

RunPackAdd(param, false);
}
Expand Down Expand Up @@ -201,7 +201,7 @@ TEST_F(CPackGetTests, InitValidInstallTest) {
// Validate pack environment setup without
// build environment and without argument passed
TEST_F(CPackGetTests, InitNoEnvNoArgTest) {
TestParam param = { "", "", "", "", false };
TestParam param = { "", "", "", "", true };

RunInit(param, false);
}
Expand Down

0 comments on commit 91d8e42

Please sign in to comment.