-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build cutter-deps on GHA , update qt and Python (#10)
* Move cutter deps from Travis to GHA due to more open source friendly plan * Ensure that resulting Linux libs can be used for building Cutter release package on GHA and don't depend on Travis specific library versions * Use latest cutter-deps-qt with qt 5.15.2 see rizinorg/cutter-deps-qt#3 * lib_isntall_path.patch applied upstream https://bugreports.qt.io/browse/PYSIDE-1299 * Update Python to 3.9.1 * https://bugreports.qt.io/browse/PYSIDE-1299 fixed paths for libs but introduced absolute path for shibokken executable
- Loading branch information
Showing
11 changed files
with
129 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
name: package build | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
tags: | ||
- v* | ||
pull_request: | ||
branches: | ||
- master | ||
|
||
jobs: | ||
build: | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
os: [ubuntu-16.04, macos-10.15] | ||
fail-fast: false | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: build linux | ||
if: contains(matrix.os, 'ubuntu') | ||
run: | | ||
set -euo pipefail | ||
sudo apt remove llvm-9 | ||
sudo apt install libclang-8-dev llvm-8 mesa-common-dev libgl1-mesa-dev | ||
make | ||
echo UPLOAD_FILE=cutter-deps-linux.tar.gz >> $GITHUB_ENV | ||
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV | ||
- name: build macos | ||
if: contains(matrix.os, 'macos') | ||
run: | | ||
set -euo pipefail | ||
brew install llvm ccache | ||
export PATH=/usr/local/opt/llvm/bin:$PATH; | ||
xcode-select -print-path | ||
ls /Applications | ||
sudo xcode-select -s /Applications/Xcode_11.2.1.app/Contents/Developer | ||
# sudo xcode-select -s /Applications/Xcode_11.5.app/Contents/Developer | ||
xcode-select -print-path | ||
which llvm-config | ||
llvm-config --version | ||
make | ||
echo UPLOAD_FILE=cutter-deps-macos.tar.gz >> $GITHUB_ENV | ||
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV | ||
- name: build windows | ||
if: contains(matrix.os, 'windows') | ||
shell: cmd | ||
run: | | ||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 | ||
C:\msys64\usr\bin\bash -lc " | ||
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe && | ||
7z x -oLLVM LLVM-10.0.0-win64.exe && | ||
export LLVM_INSTALL_DIR=\"$PWD/LLVM\" && | ||
cd \"%APPVEYOR_BUILD_FOLDER%\" && | ||
export PATH=\"$PWD/qt/bin:$LLVM_INSTALL_DIR/bin:$PATH\" && | ||
make PYTHON_WINDOWS=\"C:\Python36-x64\"" | ||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: ${{ env.UPLOAD_FILE }} | ||
path: ${{ env.UPLOAD_FILE }} | ||
- name: Get release | ||
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') | ||
id: get_release | ||
uses: karliss/get-release@bee343636450eb2e9b85d9f1592d8d73c408dc74 | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
- name: Upload release assets | ||
if: false && steps.get_release.outputs.upload_url != null | ||
uses: actions/[email protected] | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
with: | ||
upload_url: ${{ steps.get_release.outputs.upload_url }} | ||
asset_path: ${{ env.UPLOAD_FILE }} | ||
asset_name: ${{ env.UPLOAD_FILE }} | ||
asset_content_type: ${{ env.UPLOAD_ASSET_TYPE }} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- sources/pyside2/CMakeLists.txt 2020-11-11 14:51:30.000000000 +0200 | ||
+++ sources/pyside2/CMakeListsAfter.txt 2020-12-07 22:48:36.144247404 +0200 | ||
@@ -252,7 +252,8 @@ | ||
##################################################################### | ||
|
||
add_subdirectory(libpyside) | ||
-find_package(Qt${QT_MAJOR_VERSION}Designer) | ||
+#find_package(Qt${QT_MAJOR_VERSION}Designer) | ||
+set(Qt${QT_MAJOR_VERSION}Designer_FOUND FALSE) | ||
if(${QT_MAJOR_VERSION} LESS 6 AND Qt${QT_MAJOR_VERSION}UiTools_FOUND | ||
AND Qt${QT_MAJOR_VERSION}Designer_FOUND) | ||
add_subdirectory(plugins) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
Using CMAKE_INSTALL_PREFIX is unnecesarry and causes generated target cmake file to contain absolute path. | ||
When us just "bin" CMake generates correct relative paths making resulting package relocatable. | ||
|
||
diff --git a/sources/shiboken2/generator/CMakeLists.txt b/sources/shiboken2/generator/CMakeLists.txt | ||
index 1a3f4e5c4..a44489b03 100644 | ||
--- a/sources/shiboken2/generator/CMakeLists.txt | ||
+++ b/sources/shiboken2/generator/CMakeLists.txt | ||
@@ -30,7 +30,7 @@ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h | ||
|
||
install(TARGETS shiboken2 | ||
EXPORT Shiboken2Targets | ||
- DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | ||
+ DESTINATION "bin") | ||
|
||
set(shiboken_generator_package_name "shiboken2_generator") | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.