1
0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-01-16 04:42:53 +08:00

Remove GitHub actions that do not work anymore and simplyfy our CMake one

Windows was not removed to keep testing the qmake version
This commit is contained in:
Daniel Nicoletti 2023-11-08 20:11:55 -03:00
parent 52dd7463e7
commit b79e5359ae
7 changed files with 63 additions and 303 deletions

View File

@ -1,56 +0,0 @@
# android.yml
# base code from https://github.com/jaredtao/HelloActions-Qt
name: Android
on:
push:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
pull_request:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
qt_ver: [5.12.10]
qt_target: [android]
qt_arch: [android_x86,android_armv7,android_arm64_v8a]
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt_ver }}
target: ${{ matrix.qt_target }}
arch: ${{ matrix.qt_arch }}
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: build android
run: |
export ANDROID_SDK_ROOT=$ANDROID_HOME
export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle
cd HelloAndroid
qmake
make

View File

@ -13,6 +13,9 @@ on:
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
branches:
- master
pull_request:
paths-ignore:
- 'Example.md'
@ -25,95 +28,57 @@ on:
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
branches:
- master
jobs:
build:
runs-on: ubuntu-${{ matrix.ubuntu_version }}
name: Ubuntu-${{ matrix.ubuntu_version }}-Qt-${{ matrix.qt_version }}-shared-${{ matrix.shared }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
fail-fast: true
matrix:
ubuntu_version: [20.04, 22.04]
qt_version: [5.12.12, 5.15.2, 6.4.0]
shared: [ON, OFF]
os:
- ubuntu-latest
- windows-latest
- macos-latest
build_type:
- Debug
- Release
link_type:
- static
- shared
config:
- qt_version: "5.12"
- qt_version: "6.6.0"
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt_version }}
cache: 'true'
cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
dir: ${{ github.workspace }}/Qt
- name: Install packages
run: sudo apt-get install -y libxkbcommon-dev libxcb-xkb-dev
- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" -S "QXlsx"
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
MSVC:
name: windows-${{ matrix.win_version }}-Qt-${{ matrix.qt_version }}-shared-${{ matrix.shared }}
runs-on: windows-${{ matrix.win_version }}
strategy:
fail-fast: false
matrix:
win_version: [2019, 2022]
qt_version: [5.12.12, 5.15.2, 6.4.0]
shared: [ON, OFF]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Qt
- name: Install Qt with options and default aqtversion
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt_version }}
cache: 'true'
cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
dir: ${{ github.workspace }}/Qt
aqtversion: null # use whatever the default is
modules: ${{ matrix.config.modules }}
version: ${{ matrix.config.qt_version }}
cache: true
- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" -S "QXlsx"
- name: Checkout sources
uses: actions/checkout@v4
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Install ninja-build tool (must be after Qt due PATH changes)
uses: turtlesec-no/get-ninja@main
macos:
runs-on: macos-${{ matrix.macos_version }}
name: macos-${{ matrix.macos_version }}-Qt-${{ matrix.qt_version }}-shared-${{ matrix.shared }}
strategy:
fail-fast: false
matrix:
macos_version: [11, 12]
qt_version: [5.15.2, 6.4.0]
shared: [ON, OFF]
- name: Make sure MSVC is found when Ninja generator is in use
uses: ilammy/msvc-dev-cmd@v1
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Configure project
run: >
cmake -S QXlsx -B ./build -G Ninja
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
--warn-uninitialized
-Werror=dev
-DBUILD_SHARED_LIBS=${{ matrix.link_type == 'shared' }}
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt_version }}
cache: 'true'
cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
dir: ${{ github.workspace }}/Qt
- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -B "${{github.workspace}}/build" -S "QXlsx"
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Build Project
run: cmake --build ./build

View File

@ -1,52 +0,0 @@
# ios.yml
# base code from https://github.com/jaredtao/HelloActions-Qt
name: IOS
on:
push:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
pull_request:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-10.15]
qt_ver: [5.12.10,5.15.2]
qt_target: [ios]
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v2.10.0
with:
version: ${{ matrix.qt_ver }}
target: ${{ matrix.qt_target }}
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: build ios
run: |
cd HelloAndroid
qmake -r -spec macx-ios-clang CONFIG+=release CONFIG+=iphoneos
make

View File

@ -1,53 +0,0 @@
# macos.yml
# base code from https://github.com/jaredtao/HelloActions-Qt
name: MacOS
on:
push:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
pull_request:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]
qt_ver: [5.12.6]
qt_target: [desktop]
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v2.13.2
with:
version: ${{ matrix.qt_ver }}
target: ${{ matrix.qt_target }}
- uses: actions/checkout@v1
with:
fetch-depth: 1
- name: build
run: |
cd TestExcel
qmake
make

View File

@ -1,50 +0,0 @@
# ubuntu.yml
name: Ubuntu
on:
push:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
pull_request:
paths-ignore:
- 'Example.md'
- 'HowToSetProject.ko.md'
- 'HowToSetProject.md'
- 'README.ko.md'
- 'README.md'
- 'TestEnv.md'
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04]
qt_arch: [gcc_64]
steps:
- name: Install Qt
run : |
sudo apt-get update -y
sudo apt-get install build-essential libfontconfig1 mesa-common-dev libglu1-mesa-dev cmake qtdeclarative5-dev qml-module-qtquick-controls qtbase5-dev qtcreator qt5-default libqt5serialport5-dev qtbase5-private-dev qtdeclarative5-private-dev mesa-common-dev -y
- uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Build Project
run: |
cd TestExcel
qmake
make
./TestExcel

View File

@ -1,7 +1,6 @@
# windows.yml
name: Windows
on:
on:
push:
paths-ignore:
- 'Example.md'
@ -13,7 +12,10 @@ on:
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
- 'LICENSE'
branches:
- master
pull_request:
paths-ignore:
- 'Example.md'
@ -25,15 +27,20 @@ on:
- 'ToTest.md'
- 'ToUpgrade.md'
- 'Vision.md'
- 'LICENSE'
- 'LICENSE'
branches:
- master
jobs:
build:
runs-on: windows-2019
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v2.13.2
uses: jurplel/install-qt-action@v3
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Run Visual Studio
shell: cmd
run: |
@ -41,4 +48,3 @@ jobs:
cd TestExcel
qmake
nmake

View File

@ -28,17 +28,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
if(NOT DEFINED ${QXLSX_PARENTPATH})
if(NOT DEFINED QXLSX_PARENTPATH)
set(QXLSX_PARENTPATH ${CMAKE_CURRENT_SOURCE_DIR}/../)
endif(NOT DEFINED ${QXLSX_PARENTPATH})
endif()
if(NOT DEFINED ${QXLSX_HEADERPATH})
if(NOT DEFINED QXLSX_HEADERPATH)
set(QXLSX_HEADERPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/header/)
endif(NOT DEFINED ${QXLSX_HEADERPATH})
endif()
if(NOT DEFINED ${QXLSX_SOURCEPATH})
if(NOT DEFINED QXLSX_SOURCEPATH)
set(QXLSX_SOURCEPATH ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx/source/)
endif(NOT DEFINED ${QXLSX_SOURCEPATH})
endif()
message("Current Path of QXlsx")
message(${QXLSX_PARENTPATH})