ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Remove rimraf before make package (#3393)

Browse Source 
* ci: Remove rimraf before `make package`
* Use `|| brew link --overwrite pkgconf`
* jsdec.sh: Use `mkdir -p`
* rz-libyara.sh: Use `mkdir -p`
This commit is contained in:
Khairul Azhar Kasmiran 2024-11-24 13:00:28 +08:00 committed by GitHub
parent f2692cb847
commit 3ddb1b9a58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -432,6 +432,7 @@ jobs:
cd scripts 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 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 bundle
brew install pkg-config || brew link --overwrite pkgconf
brew install kadwanev/brew/retry brew install kadwanev/brew/retry
- name: py dependencies - name: py dependencies
run: | run: |
@ -487,8 +488,7 @@ jobs:
# https://github.com/actions/runner-images/issues/7522#issuecomment-1556766641 # https://github.com/actions/runner-images/issues/7522#issuecomment-1556766641
echo killing XProtectBehaviorService; sudo pkill -9 XProtect >/dev/null || true; echo killing XProtectBehaviorService; sudo pkill -9 XProtect >/dev/null || true;
echo waiting for XProtectBehaviorService kill; while pgrep XProtect; do sleep 3; done; 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 make package
retry 'rm -rf ../jsdec ../libswift ../rz_libyara ../rz-silhouette; make package'
export CUTTER_VERSION=$(python3 ../scripts/get_version.py) export CUTTER_VERSION=$(python3 ../scripts/get_version.py)
echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV echo PACKAGE_NAME=${PACKAGE_NAME}.dmg >> $GITHUB_ENV
echo PACKAGE_PATH=build/${PACKAGE_NAME}.dmg >> $GITHUB_ENV echo PACKAGE_PATH=build/${PACKAGE_NAME}.dmg >> $GITHUB_ENV

1
scripts/Brewfile
View File

@ -5,4 +5,3 @@ brew "xz"
brew "llvm" brew "llvm"
brew "meson" brew "meson"
brew "coreutils" brew "coreutils"
brew "pkg-config"

2
scripts/jsdec.sh
View File

@ -19,6 +19,6 @@ fi
meson setup --buildtype=release --pkg-config-path="$INSTALL_PREFIX/lib/pkgconfig" -Dbuild_type=cutter build_lib meson setup --buildtype=release --pkg-config-path="$INSTALL_PREFIX/lib/pkgconfig" -Dbuild_type=cutter build_lib
ninja -C build_lib ninja -C build_lib
mkdir build_plugin && cd build_plugin mkdir -p build_plugin && cd build_plugin
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DJSDEC_BUILD_DIR="../build_lib" -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $EXTRA_CMAKE_OPTS ../cutter-plugin cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DJSDEC_BUILD_DIR="../build_lib" -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $EXTRA_CMAKE_OPTS ../cutter-plugin
ninja install ninja install

2
scripts/rz-libyara.sh
View File

@ -19,7 +19,7 @@ meson --buildtype=release --pkg-config-path="$INSTALL_PREFIX/lib/pkgconfig" --pr
ninja -C build install ninja -C build install
cd cutter-plugin cd cutter-plugin
mkdir build && cd build mkdir -p build && cd build
cmake -G Ninja -DRIZIN_INSTALL_PLUGDIR="../build" -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $EXTRA_CMAKE_OPTS .. cmake -G Ninja -DRIZIN_INSTALL_PLUGDIR="../build" -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $EXTRA_CMAKE_OPTS ..
ninja ninja
ninja install ninja install