Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-05-14 18:13:53 +00:00
Code Issues Projects Releases Wiki Activity

testcommon: need <sys/wait.h> for WIFEXITED/WEXITSTATUS

Browse Source 
CI: try Qt6 for mac; checkout@v4 -> v6
This commit is contained in:
gitlost
2026-04-18 23:43:18 +01:00
parent 7b076717f2
commit 8a76981200
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
name: CI name: CI
# .github/workflows/ci.yml 2025-12-09 # .github/workflows/ci.yml 2026-04-18
# Controls when the action will run. Triggers the workflow on push or pull request # Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch (or test branch github_ci push) # events but only for the master branch (or test branch github_ci push)
on: on:
@@ -20,7 +20,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job # Steps represent a sequence of tasks that will be executed as part of the job
steps: steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install libpng-dev - name: Install libpng-dev
run: sudo apt-get install libpng-dev run: sudo apt-get install libpng-dev
@@ -64,7 +64,7 @@ jobs:
BUILD_TYPE: Debug BUILD_TYPE: Debug
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Install libpng-dev - name: Install libpng-dev
run: sudo apt-get install libpng-dev run: sudo apt-get install libpng-dev
@@ -105,7 +105,7 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Create Build Environment - name: Create Build Environment
shell: bash shell: bash
@@ -164,7 +164,7 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Create Build Environment - name: Create Build Environment
shell: bash shell: bash
@@ -221,7 +221,7 @@ jobs:
runs-on: macOS-latest runs-on: macOS-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Create Build Environment - name: Create Build Environment
shell: bash shell: bash
@@ -231,9 +231,9 @@ jobs:
shell: bash shell: bash
run: brew install libpng run: brew install libpng
- name: Install Qt5 - name: Install Qt6
shell: bash shell: bash
run: brew install qt5 run: brew install qt6
- name: Install GS1 Syntax Engine - name: Install GS1 Syntax Engine
run: git clone --depth=1 https://github.com/gs1/gs1-syntax-engine && cd gs1-syntax-engine/src/c-lib && make lib && (sudo make install || true) run: git clone --depth=1 https://github.com/gs1/gs1-syntax-engine && cd gs1-syntax-engine/src/c-lib && make lib && (sudo make install || true)
@@ -241,7 +241,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
working-directory: build working-directory: build
shell: bash shell: bash
run: PATH=$PATH:/opt/homebrew/opt/qt@5/bin cmake $GITHUB_WORKSPACE -DCMAKE_C_FLAGS='-I /usr/local/include' -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON run: PATH=$PATH:/opt/homebrew/opt/qt@6/bin cmake $GITHUB_WORKSPACE -DCMAKE_C_FLAGS='-I /usr/local/include' -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_QT6=ON
- name: Build - name: Build
working-directory: build working-directory: build
@@ -257,7 +257,7 @@ jobs:
runs-on: macOS-latest runs-on: macOS-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Create Build Environment - name: Create Build Environment
shell: bash shell: bash
@@ -282,7 +282,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- name: Build FreeBSD - name: Build FreeBSD
id: build-freebsd id: build-freebsd

3
backend/tests/testcommon.c
View File

@@ -47,6 +47,9 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef _WIN32
#include <sys/wait.h> /* For WIFEXITED/WEXITSTATUS */
#endif
#include "testcommon.h" #include "testcommon.h"
#include "../eci.h" #include "../eci.h"

2
frontend/tests/test_args.c
View File

@@ -30,7 +30,7 @@
/* SPDX-License-Identifier: BSD-3-Clause */ /* SPDX-License-Identifier: BSD-3-Clause */
#ifndef _WIN32 #ifndef _WIN32
#include <sys/wait.h> #include <sys/wait.h> /* For WIFEXITED/WEXITSTATUS */
#endif #endif
#include "testcommon.h" #include "testcommon.h"