mirror of
https://github.com/open-simh/simh.git
synced 2026-01-25 19:57:36 +00:00
SCP: sprint_val comma bug, GH: Remnant symlinks
- Fix comma separator code segmentation fault: "ndigit - 3" can become a very large unsigned number for ndigit < 3. - dir_cmd: Allocate WildName from heap to reduce stack pressure. - Github CI/CD: Remnant symlink issue reappeared, afflicting the makefile-based build. For better or worse, the workaround is now dependent on specific Python versions that must be removed, unlinked and any remnant symlinks that HomeBrew decided it needed to install in /usr/local/bin. The Python upgrade is triggered by the sdl2_ttf package. According to the Github image maintainers, this is an old, known issue in macOS images that originates inside of Homebrew.
This commit is contained in:
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@@ -35,10 +35,26 @@ jobs:
|
||||
- scelbi 3b2 i701 i704 i7010 i7070 i7080 i7090 sigma uc15 i650 sel32 intel-mds ibm1130
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
## Workaround for remnant symlinks in /usr/local pointing back to
|
||||
## macOS frameworks.
|
||||
##
|
||||
## Future: Will have to keep an eye on SDL_ttf's Python dependency
|
||||
## so that the correct/appropriate Python version is removed.
|
||||
- name: Remnant symlink cleanup (macOS)
|
||||
if: ${{runner.os == 'macOS'}}
|
||||
run: |
|
||||
brew unlink python@3 || true
|
||||
brew uninstall --ignore-dependencies python@3 || true
|
||||
brew unlink python@3.12 || true
|
||||
brew uninstall --ignore-dependencies python@3.12 || true
|
||||
for f in $(find /usr/local/bin -type l -print); do \
|
||||
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \
|
||||
done || exit 0
|
||||
## Install our regular dependencies.
|
||||
- name: Install dependencies (macOS)
|
||||
if: ${{runner.os == 'macOS'}}
|
||||
run: sh -ex .travis/deps.sh osx
|
||||
- name: Install dependencies
|
||||
- name: Install dependencies (Linux)
|
||||
if: ${{runner.os == 'Linux'}}
|
||||
run: sh -ex .travis/deps.sh linux
|
||||
- name: makefile build
|
||||
|
||||
19
.github/workflows/cmake-builds.yml
vendored
19
.github/workflows/cmake-builds.yml
vendored
@@ -46,15 +46,22 @@ jobs:
|
||||
os: [macos-12, macos-11]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
## For some reason, the macos-11 image has symlinks to /Library in /usr/local/bin
|
||||
- name: Clean /usr/local/bin symlinks
|
||||
## Workaround for remnant symlinks in /usr/local pointing back to
|
||||
## macOS frameworks.
|
||||
##
|
||||
## Future: Will have to keep an eye on SDL_ttf's Python dependency
|
||||
## so that the correct/appropriate Python version is removed.
|
||||
- name: Remnant symlink cleanup
|
||||
run: |
|
||||
brew unlink python@3 || true
|
||||
brew uninstall --ignore-dependencies python@3 || true
|
||||
brew unlink python@3.12 || true
|
||||
brew uninstall --ignore-dependencies python@3.12 || true
|
||||
for f in $(find /usr/local/bin -type l -print); do \
|
||||
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \
|
||||
done || exit 0
|
||||
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \
|
||||
done || exit 0
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sh -ex .travis/deps.sh osx
|
||||
run: sh -ex .travis/deps.sh osx
|
||||
- name: cmake-builder.sh
|
||||
run: |
|
||||
cmake/cmake-builder.sh --config Release --flavor xcode --lto --notest --cpack_suffix x86_64.${{matrix.os}}
|
||||
|
||||
Reference in New Issue
Block a user