Skip to content

Commit

Permalink
Update versions and test case
Browse files Browse the repository at this point in the history
  • Loading branch information
@brondani
brondani authored May 25, 2023
1 parent 2fb6da3 commit 250e92e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/toolbox.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Open-CMSIS-Pack/devtools"
version: tags/tools/buildmgr/1.7.0
version: tags/tools/buildmgr/2.0.0-dev0
file: cbuild_install.sh
target: toolbox/cbuild/cbuild_install.sh
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -47,7 +47,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Open-CMSIS-Pack/devtools"
version: tags/tools/packchk/1.3.98
version: tags/tools/packchk/1.3.99
regex: true
file: "packchk-.*\\.(zip|tbz2)"
target: "toolbox/packchk/"
Expand All @@ -57,7 +57,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Open-CMSIS-Pack/devtools"
version: tags/tools/svdconv/3.3.44
version: tags/tools/svdconv/3.3.45
regex: true
file: "svdconv-.*\\.(zip|tbz2)"
target: "toolbox/svdconv/"
Expand All @@ -70,18 +70,18 @@ jobs:
./cbuild/cbuild_install.sh -x cbuild
cp -r cbuild/bin/* distribution/bin
cp -r cbuild/etc/* distribution/etc
tar -xvf packchk/packchk-*-darwin64-amd64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.mac-amd64
#tar -xvf packchk/packchk-*-darwin64-arm64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.mac-arm64
tar -xvf packchk/packchk-*-linux64-amd64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.lin-amd64
tar -xvf packchk/packchk-*-linux64-arm64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.lin-arm64
unzip packchk/packchk-\*-windows64-amd64.zip -d packchk && mv packchk/packchk.exe distribution/bin/packchk.exe-amd64
#unzip packchk/packchk-\*-windows64-arm64.zip -d packchk && mv packchk/packchk.exe distribution/bin/packchk.exe-arm64
tar -xvf svdconv/svdconv-*-darwin64-amd64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.mac-amd64
#tar -xvf svdconv/svdconv-*-darwin64-arm64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.mac-arm64
tar -xvf svdconv/svdconv-*-linux64-amd64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.lin-amd64
tar -xvf svdconv/svdconv-*-linux64-arm64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.lin-arm64
unzip svdconv/svdconv-\*-windows64-amd64.zip -d svdconv && mv svdconv/svdconv.exe distribution/bin/svdconv.exe-amd64
#unzip svdconv/svdconv-\*-windows64-arm64.zip -d svdconv && mv svdconv/svdconv.exe distribution/bin/svdconv.exe-arm64
tar -xvf packchk/packchk-*-darwin-amd64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.mac-amd64
tar -xvf packchk/packchk-*-darwin-arm64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.mac-arm64
tar -xvf packchk/packchk-*-linux-amd64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.lin-amd64
tar -xvf packchk/packchk-*-linux-arm64.tbz2 -C packchk && mv packchk/packchk distribution/bin/packchk.lin-arm64
unzip packchk/packchk-\*-windows-amd64.zip -d packchk && mv packchk/packchk.exe distribution/bin/packchk.exe-amd64
unzip packchk/packchk-\*-windows-arm64.zip -d packchk && mv packchk/packchk.exe distribution/bin/packchk.exe-arm64
tar -xvf svdconv/svdconv-*-darwin-amd64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.mac-amd64
tar -xvf svdconv/svdconv-*-darwin-arm64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.mac-arm64
tar -xvf svdconv/svdconv-*-linux-amd64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.lin-amd64
tar -xvf svdconv/svdconv-*-linux-arm64.tbz2 -C svdconv && mv svdconv/svdconv distribution/bin/svdconv.lin-arm64
unzip svdconv/svdconv-\*-windows-amd64.zip -d svdconv && mv svdconv/svdconv.exe distribution/bin/svdconv.exe-amd64
unzip svdconv/svdconv-\*-windows-arm64.zip -d svdconv && mv svdconv/svdconv.exe distribution/bin/svdconv.exe-arm64
cp ../docs/LICENSE.txt distribution
cp ../docs/index.html distribution/doc
working-directory: toolbox
Expand Down Expand Up @@ -254,8 +254,8 @@ jobs:
cp zip/bin/cbuildgen.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cbuildgen.exe
cp zip/bin/cpackget.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/cpackget.exe
cp zip/bin/csolution.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/csolution.exe
#cp zip/bin/packchk.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/packchk.exe
#cp zip/bin/svdconv.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/svdconv.exe
cp zip/bin/packchk.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/packchk.exe
cp zip/bin/svdconv.exe-arm64 zip/cmsis-toolbox-windows-arm64/bin/svdconv.exe
cp zip/bin/cbuild.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cbuild
cp zip/bin/cbuildgen.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cbuildgen
cp zip/bin/cpackget.lin-amd64 zip/cmsis-toolbox-linux-amd64/bin/cpackget
Expand All @@ -278,8 +278,8 @@ jobs:
cp zip/bin/cbuildgen.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cbuildgen
cp zip/bin/cpackget.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/cpackget
cp zip/bin/csolution.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/csolution
#cp zip/bin/packchk.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/packchk
#cp zip/bin/svdconv.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/svdconv
cp zip/bin/packchk.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/packchk
cp zip/bin/svdconv.mac-arm64 zip/cmsis-toolbox-darwin-arm64/bin/svdconv
cp zip/LICENSE.txt zip/cmsis-toolbox-windows-amd64/LICENSE.txt
cp zip/LICENSE.txt zip/cmsis-toolbox-windows-arm64/LICENSE.txt
cp zip/LICENSE.txt zip/cmsis-toolbox-linux-amd64/LICENSE.txt
Expand Down
12 changes: 6 additions & 6 deletions test/src/InstallerTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ void ToolBoxInstallerTests::CheckExtractedDir(const string& path, bool expect) {
"csolution.lin-amd64", "csolution.exe-amd64", "csolution.mac-amd64",
"packchk.lin-amd64", "packchk.exe-amd64", "packchk.mac-amd64",
"svdconv.lin-amd64", "svdconv.exe-amd64", "svdconv.mac-amd64",
"cbuild.lin-arm64",
"cpackget.lin-arm64",
"cbuildgen.lin-arm64",
"csolution.lin-arm64",
"packchk.lin-arm64",
"svdconv.lin-arm64" }},
"cbuild.lin-arm64", "cbuild.exe-arm64", "cbuild.mac-arm64",
"cpackget.lin-arm64", "cpackget.exe-arm64", "cpackget.mac-arm64",
"cbuildgen.lin-arm64", "cbuildgen.exe-arm64", "cbuildgen.mac-arm64",
"csolution.lin-arm64", "csolution.exe-arm64", "csolution.mac-arm64",
"packchk.lin-arm64", "packchk.exe-arm64", "packchk.mac-arm64",
"svdconv.lin-arm64", "svdconv.exe-arm64", "svdconv.mac-arm64"}},

{ "doc", vector<string>{
"index.html"}},
Expand Down

0 comments on commit 250e92e

Please sign in to comment.