Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci macos-x86_64: Upgrade to the macos-13 image #3387

Merged
merged 31 commits into from
Oct 21, 2024
Merged

ci macos-x86_64: Upgrade to the macos-13 image #3387

Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
51d23de
ci macos-x86_64: Upgrade to the macos-14-large image
kazarmy Oct 20, 2024
1e69ddd
Revert "ci macos-x86_64: Upgrade to the macos-14-large image"
kazarmy Oct 20, 2024
78a9998
ci macos-x86_64: Upgrade to the macos-13 image
kazarmy Oct 20, 2024
29931e7
mac ci: Kill XProtectBehaviorService before making package
kazarmy Oct 20, 2024
4b33f82
Try adding -debug to hdiutil
kazarmy Oct 20, 2024
53612bb
Merge branch 'dev' of https://github.com/rizinorg/cutter into macos-1…
kazarmy Oct 20, 2024
d6c6552
Add hdiutil-debug.sh
kazarmy Oct 20, 2024
bb66970
Use absolute path for hdiutil-debug.sh
kazarmy Oct 20, 2024
bc45892
Use /bin/bash
kazarmy Oct 20, 2024
77563ba
Revert "Use /bin/bash"
kazarmy Oct 20, 2024
064d10c
Revert "Use absolute path for hdiutil-debug.sh"
kazarmy Oct 20, 2024
c20f015
Revert "Add hdiutil-debug.sh"
kazarmy Oct 20, 2024
6a4aeaf
Revert "Try adding -debug to hdiutil"
kazarmy Oct 20, 2024
e374667
Retry `make package` until it works
kazarmy Oct 20, 2024
0dda13b
Revert "mac ci: Kill XProtectBehaviorService before making package"
kazarmy Oct 20, 2024
a66bb3b
Do `rm -rf`
kazarmy Oct 20, 2024
0212980
Revert "Revert "mac ci: Kill XProtectBehaviorService before making pa…
kazarmy Oct 20, 2024
0fe73a1
Set exclusive upper bound for Python version
kazarmy Oct 20, 2024
8229db4
Revert "Set exclusive upper bound for Python version"
kazarmy Oct 20, 2024
3f7ee23
Uninstall Python 3.13
kazarmy Oct 20, 2024
bfc6052
Revert "Uninstall Python 3.13"
kazarmy Oct 20, 2024
e78c29c
Add comment regarding XProtectBehaviorService kill
kazarmy Oct 20, 2024
0d5b7db
Move `kadwanev/brew/retry` install to "homebrew dependencies" section
kazarmy Oct 21, 2024
97b93a5
Add rimraf comment
kazarmy Oct 21, 2024
84e12d6
Try using a Python venv
kazarmy Oct 21, 2024
ee2fa79
Have separate macos "py dependencies" section
kazarmy Oct 21, 2024
26044c7
Use Python_FIND_VIRTUALENV=ONLY
kazarmy Oct 21, 2024
0885d9b
Use Python3_FIND_VIRTUALENV=ONLY
kazarmy Oct 21, 2024
3a1ff3a
Use Python3_FIND_STRATEGY="LOCATION" instead
kazarmy Oct 21, 2024
7cf9e2a
Revert "Have separate macos "py dependencies" section"
kazarmy Oct 21, 2024
8f4f89f
Revert "Try using a Python venv"
kazarmy Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ jobs:
python-version: 3.12.x
output-id: artifact_windows
- name: macos-x86_64
os: macos-12
os: macos-13
arch: x86_64
package: true
- name: macos-arm64
Expand All @@ -432,6 +432,7 @@ jobs:
cd scripts
rm /usr/local/bin/2to3* # symlink to some kind of existing python2.7 installation conflicts with brew python3 which gets installed as indirect dependency
brew bundle
brew install kadwanev/brew/retry
- name: py dependencies
run: |
#python3 -m pip install -U pip==21.3.1
Expand Down Expand Up @@ -464,6 +465,8 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \
-DPython3_ROOT_DIR="${CUTTER_DEPS_PYTHON_PREFIX}" \
-DPython_ROOT_DIR="${CUTTER_DEPS_PYTHON_PREFIX}" \
-DPython3_FIND_STRATEGY="LOCATION" \
-DPython_FIND_STRATEGY="LOCATION" \
-DCUTTER_ENABLE_PYTHON=ON \
-DCUTTER_ENABLE_PYTHON_BINDINGS=ON \
-DCUTTER_USE_BUNDLED_RIZIN=ON \
Expand All @@ -480,7 +483,12 @@ jobs:
-DCPACK_BUNDLE_APPLE_CERT_APP="-" \
.. && \
make -j4;
make package
# Reduce chance for random hdiutil "Resource busy" error when creating the dmg
# https://github.com/actions/runner-images/issues/7522#issuecomment-1556766641
echo killing XProtectBehaviorService; sudo pkill -9 XProtect >/dev/null || true;
karliss marked this conversation as resolved.
Show resolved Hide resolved
echo waiting for XProtectBehaviorService kill; while pgrep XProtect; do sleep 3; done;
# Rimraf plugins built by `make package` because jsdec cannot be built twice
retry 'rm -rf ../jsdec ../libswift ../rz_libyara ../rz-silhouette; make package'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this is done on some plugins and not all the plugins? is this related to some redness where they do not compile? if yes, add a comment explaining why this is here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's due to (https://github.com/rizinorg/cutter/actions/runs/11425970615/job/31788307472#step:7:9706):

rimraf-reason

the other plugins were rimrafed because the build is so slow and it would have taken too long to check the plugins one-by-one

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if yes, add a comment explaining why this is here.

ok 97b93a5

export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV
echo PACKAGE_PATH=build/${PACKAGE_NAME}.dmg >> $GITHUB_ENV
Expand Down Expand Up @@ -644,4 +652,4 @@ jobs:
cd sample-cpp
mkdir build
cmake -B build -DCMAKE_PREFIX_PATH="%CD%/../cutter;%CD%/../cutter-deps/qt"
cmake --build build
cmake --build build
Loading