diff --git a/.gitlab/ci/iar-env.sh b/.gitlab/ci/iar-env.sh index 29246a1f1e..8583c71164 100644 --- a/.gitlab/ci/iar-env.sh +++ b/.gitlab/ci/iar-env.sh @@ -1,5 +1,5 @@ files=' -bxarm-9.50.2.deb +bxarm-9.60.3.deb bxavr-8.10.2.deb bxrh850-3.10.2.deb bxriscv-3.30.1.deb @@ -12,7 +12,7 @@ for f in $files; do done echo ' -cb6a276ace472939fbb76fc5ce517149296ac2c87047b59504f9fe95aed81794 bxarm-9.50.2.deb +b65e7e51fa61dd058d9946901ccb2d2b878973573e8d28761644d541bb93a82d bxarm-9.60.3.deb 4a1065291952a23a8bfbbaa4eb36ca49b0af8653b8faab34ce955d9d48d64506 bxavr-8.10.2.deb b14085a0f21750c58168125d3cece2e3fcbd4c6495c652b5e65b6637bac0ac31 bxrh850-3.10.2.deb 517e18dffdd4345f97c480b5128c7feea25ec1c3f06e62d8e2e6808c401d514a bxriscv-3.30.1.deb diff --git a/.gitlab/ci/iar.ps1 b/.gitlab/ci/iar.ps1 index d71dd0aec2..a372437cfb 100644 --- a/.gitlab/ci/iar.ps1 +++ b/.gitlab/ci/iar.ps1 @@ -7,7 +7,7 @@ $outdir = "$outdir\.gitlab" $iar_dir = New-Item -Force -ItemType Directory -Path "$outdir\iar" $files = @{ - "bxarm-9.50.2.71951-1.zip" = "8A1C16673CEDF95DB94214159EADF06E86E66FA177149D0F379AACA88E26BC15" + "bxarm-9.60.3.7274-1.zip" = "AE1923440B260FD8F7AA75AB0BF15B8AC7AF9A7865C07F6B9A73F8D05DFEA7E1" "BXAVR-8102-1.zip" = "862EFD23531854506070D5647F9B32197B80E5A727304BFBD8E386A3DAADF093" "BXRH850-3102-1.zip" = "8D1D009A0D138C7CA8431316123CB85CE1B41319A68B997F90D2E338CD469C7F" "BXRISCV-3301-1.zip" = "59FF23F7B98EE72567A23942DE799AF137791A19BFEC102B2A59821FABBCA55A" diff --git a/.gitlab/ci/repackage/iar.ps1 b/.gitlab/ci/repackage/iar.ps1 index bb8bb0401b..5a8c1e56f7 100644 --- a/.gitlab/ci/repackage/iar.ps1 +++ b/.gitlab/ci/repackage/iar.ps1 @@ -18,12 +18,23 @@ $installer_file = Get-Item $installer $installer_name = $installer_file.Name $package_name = $installer_file.Basename + "-" + $revision $package_dir = "$basedir\$package_name" - +$exclude = @( + "arm/config/debugger" + "arm/config/flashloader" + "arm/drivers" + "arm/src" + ) Write-Host "Installing to: $package_dir" Start-Process -Wait -FilePath "$installer_file" -ArgumentList "/hide_usd /autoinstall/$package_dir" +foreach ($p in $exclude) { + Remove-Item "$package_dir/$p" -Recurse -Force +} + @" -This was repackaged from an installation by "$installer_name". +This was repackaged from an installation by "$installer_name" +using CMake's ".gitlab/ci/repackage/iar.ps1" script. + Obtain a network license as follows: set IAR_LMS_SETTINGS_DIR=%cd%\license