Skip to content

Commit

Permalink
Qt 6.7.2 update. (#16)
Browse files Browse the repository at this point in the history
- Qt 6.7.2 update.
- Python 3.12.4
  • Loading branch information
karliss authored Jul 24, 2024
1 parent fa27359 commit a57df7a
Show file tree
Hide file tree
Showing 11 changed files with 172 additions and 210 deletions.
31 changes: 0 additions & 31 deletions .appveyor.yml

This file was deleted.

99 changes: 74 additions & 25 deletions .github/workflows/package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,22 @@ concurrency:

jobs:
build-linux:
runs-on: ubuntu-latest
container:
image: ubuntu:18.04
runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: set timezone
- name: build linux outputs
run: |
# Fix timezone on ubuntu to prevent user input request during the apt-get phase.
export TZ=UTC
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
- name: build linux
shell: bash
run: |
apt-get -y update
apt-get -y install build-essential \
libclang-8-dev \
llvm-8 \
libglib2.0-dev \
sudo apt-get -y update
sudo apt-get -y install build-essential \
libclang-12-dev \
llvm-12 \
cmake \
mesa-common-dev \
libgl1-mesa-dev \
zlib1g-dev \
libpcre2-dev \
cmake \
curl \
wget
curl
sudo apt remove llvm-10 clang-10
make
echo UPLOAD_FILE=cutter-deps-linux-x86_64.tar.gz >> $GITHUB_ENV
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
Expand All @@ -66,18 +55,78 @@ jobs:
asset_path: ${{ env.UPLOAD_FILE }}
asset_name: ${{ env.UPLOAD_FILE }}
asset_content_type: ${{ env.UPLOAD_ASSET_TYPE }}
build-windows:
runs-on: windows-2019
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: build windows ouptuts
shell: cmd
run: |
pwd
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
where cl
where python
set MSYS2_PATH_TYPE=inherit
C:/shells/msys2bash.cmd "./scripts/build_win.sh"
- name: set windows outputs
shell: bash
run: |
echo UPLOAD_FILE=cutter-deps-win-x86_64.tar.gz >> $GITHUB_ENV
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
- 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: 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 }}
build-macos:
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
name: [
macos-x86_64,
macos-arm64,
]
include:
- name: macos-x86_64
os: macos-12
arch: x86_64
- name: macos-arm64
os: macos-14
arch: arm64
steps:
- uses: actions/checkout@v3
- name: build macos
run: |
set -euo pipefail
brew install llvm ccache
export PATH="/usr/local/opt/llvm/bin:$PATH";
if [ "${{ matrix.arch }}" = "arm64" ]; then
export CMAKE_PREFIX_PATH="$HOMEBREW_PREFIX/opt/llvm";
else
export CMAKE_PREFIX_PATH="/usr/local/opt/llvm";
fi
echo "###### Applications ######"
ls /Applications
echo "###### XCode Info ######"
Expand All @@ -87,16 +136,16 @@ jobs:
echo "###### xcode-select Info ######"
xcode-select -print-path
echo "###### LLVM Info ######"
which llvm-config
llvm-config --version
which clang
brew info llvm
echo "###### Make ######"
export MACOSX_DEPLOYMENT_TARGET=11.0
export MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET=11.0
export CFLAGS=" -isysroot $BUILD_SDK_PATH "
export CCFLAGS=" -isysroot $BUILD_SDK_PATH "
export CXXFLAGS=" -isysroot $BUILD_SDK_PATH "
make
echo UPLOAD_FILE=cutter-deps-macos-x86_64.tar.gz >> $GITHUB_ENV
echo UPLOAD_FILE=cutter-deps-macos-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
- uses: actions/upload-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/python
/test
/qt-everywhere-src-*
/pyside-setup-opensource-src-*
/pyside-setup-*-src-*
/Python-3.*
/patchelf-0.9*
/cutter-deps-*-*.tar.gz
Expand Down
43 changes: 0 additions & 43 deletions .travis-disabled.yml

This file was deleted.

Loading

0 comments on commit a57df7a

Please sign in to comment.