From aeddff6de8346fc000fff53af68c6e8504c7f384 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 16 Jul 2023 14:09:53 -1000 Subject: [PATCH] APPVEYOR: Reorder build platforms to be: macOS, Ubuntu, and Windows - This exercises macOS first which is more likely to have build issues than Linux or Windows. - Fix the format of the date used in filenames and commit messages - Only include the platform simulator binaries in the created tarball --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0a7b6f45..4f1d8e07 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: - - Visual Studio 2015 - - Ubuntu2004 - macos-monterey + - Ubuntu2004 + - Visual Studio 2015 platform: - x86 @@ -58,7 +58,7 @@ on_success: - ps: | $id_line = Select-String -Path $commit_id_file -Pattern 'SIM_GIT_COMMIT_ID' $id = $id_line.Line.SubString($id_line.line.IndexOf("SIM_GIT_COMMIT_ID") + 18, 8) - $datetime = Get-Date -Format "yyyy-mm-dd_hh-mm-ss" + $datetime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss" $version_major = (Select-String -Path 'sim_rev.h' -Pattern '#define\s+SIM_MAJOR\s+(\d+)').Matches.Groups[1].Value $version_minor = (Select-String -Path 'sim_rev.h' -Pattern '#define\s+SIM_MINOR\s+(\d+)').Matches.Groups[1].Value $version_mode = (Select-String -Path 'sim_rev.h' -Pattern '#define\s+SIM_VERSION_MODE\s+"(.+?)"').Matches.Groups[1].Value @@ -75,7 +75,7 @@ on_success: Compress-Archive -Path ..\BIN\NT\Win32-Release\*.exe -DestinationPath "$pkg_filename.zip" } else { pushd ../BIN - tar -cvzf ../Development-Binaries/$pkg_filename.tgz --exclude=buildtools '--exclude=*-build' ../BIN * + tar -cvzf ../Development-Binaries/$pkg_filename.tgz --exclude=buildtools '--exclude=*-build' * popd } "$platform Build results for simh Commit: https://github.com/simh/simh/commit/$id" | Out-File -FilePath ../pkg_commit_message -Encoding ascii