From 1e2c3efac07529744d784b1ebb1fd04beed27e7a Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 16 Jul 2023 10:00:50 -1000 Subject: [PATCH] APPVEYOR: Assure that build failures don't try to save binaries --- README.md | 5 +++-- appveyor.yml | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a614b703..d1fcd806 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ # SIMH v4.0 - 19-01 Current [![Coverity Scan Build Status](https://scan.coverity.com/projects/11982/badge.svg)](https://scan.coverity.com/projects/simh) -[![Github CI Build Status](https://github.com/simh/simh/actions/workflows/build.yml/badge.svg)](https://github.com/simh/simh/actions/workflows/build.yml) -[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/simh/simh)](https://ci.appveyor.com/project/simh/simh/history) +[![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/github/simh/simh)](https://ci.appveyor.com/project/simh/simh/history) ## Table of Contents: [WHAT'S NEW since the Open SIMH fork](#whats-new-since-the-open-simh-fork) @@ -50,6 +49,8 @@ All Simulator updates on Open SIMH will be present in this repository, and any changes to the master branch code in this repository authored by anyone except Mark Pizzolato may be posted as pull requests on the Open simh repo. +Simulator binaries for x86 Linus, x86 macOS, and Windows for all recent changes are available at https://github.com/simh/Development-Binaries + ### Mark Pizzolato's changes only present in the simh/simh repo and not present in the Open SIMH repo: #### Visible changes to SCP (the simulator framework or command execution environment) diff --git a/appveyor.yml b/appveyor.yml index 5ddd33cc..0a7b6f45 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,6 @@ build_script: $platform = 'Windows' $commit_id_file = 'Visual Studio Projects\.git-commit-id.h' } else { - make QUIET=1 $parallel $platform = uname -s if ($platform -eq 'Linux') { $ncpus = nproc @@ -52,15 +51,17 @@ build_script: $platform = 'macOS' } $commit_id_file = '.git-commit-id' + make QUIET=1 $parallel } + +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" $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 - -on_success: - git config --global credential.helper store - ps: Set-Content -Path "$HOME\.git-credentials" -Value "https://$($env:access_token):x-oauth-basic@github.com`n" -NoNewline - git config --global credential.helper store @@ -77,7 +78,7 @@ on_success: tar -cvzf ../Development-Binaries/$pkg_filename.tgz --exclude=buildtools '--exclude=*-build' ../BIN * popd } - "Build results on $datetime for simh Commit: https://github.com/simh/simh/commit/$id" | Out-File -FilePath ../pkg_commit_message -Encoding ascii + "$platform Build results for simh Commit: https://github.com/simh/simh/commit/$id" | Out-File -FilePath ../pkg_commit_message -Encoding ascii - git add * - git commit -F ../pkg_commit_message - git push -u origin master