From c708d93db30a092ed56a501ea305f025abd60347 Mon Sep 17 00:00:00 2001 From: red0124 <75804778+red0124@users.noreply.github.com> Date: Sat, 5 Jul 2025 15:17:58 +0200 Subject: [PATCH] CI Update (#53) * Remove 32-bit CI workflows * [skip ci] Update Windows CI images * [skip ci] Update MacOS CI image * [skip ci] Remove icc scripts * Update README --- .github/workflows/macos-apple-clang.yml | 6 +++--- .github/workflows/win-msvc.yml | 5 +---- .github/workflows/win-msys2-clang.yml | 7 +------ .github/workflows/win-msys2-gcc.yml | 7 +------ README.md | 16 ++++++++-------- script/ci_install_deps.sh | 10 +++++++--- script/ci_install_icc.sh | 23 ----------------------- script/ci_setup_icc.sh | 11 ----------- 8 files changed, 21 insertions(+), 64 deletions(-) delete mode 100755 script/ci_install_icc.sh delete mode 100755 script/ci_setup_icc.sh diff --git a/.github/workflows/macos-apple-clang.yml b/.github/workflows/macos-apple-clang.yml index 40ae04b..a137624 100644 --- a/.github/workflows/macos-apple-clang.yml +++ b/.github/workflows/macos-apple-clang.yml @@ -25,10 +25,10 @@ jobs: strategy: matrix: - xcode: ['13.4.1', '14.1'] + xcode: ['15.2'] type: [Release, Debug] - runs-on: macos-12 + runs-on: macos-latest env: DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer @@ -42,7 +42,7 @@ jobs: id: cores - name: Install dependencies - run: script/ci_install_deps.sh + run: script/ci_install_deps.sh sudo - name: Configure run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}} diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index 4bc7759..1ef6e15 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -31,14 +31,11 @@ jobs: fail-fast: false matrix: config: - - os: windows-2019 - vs: "Visual Studio 16 2019" - - os: windows-latest vs: "Visual Studio 17 2022" build: [Debug, Release] - platform: [Win32, x64] + platform: [x64] runs-on: ${{matrix.config.os}} diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 6a0ff25..de46de0 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: - os: [windows-2019, windows-latest] + os: [windows-2025, windows-latest] type: [Release, Debug] config: - msystem: "MINGW64" @@ -39,11 +39,6 @@ jobs: git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang - - msystem: "MINGW32" - install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja - mingw-w64-i686-clang - runs-on: ${{matrix.os}} name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index defed69..f0420ed 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: - os: [windows-2019, windows-latest] + os: [windows-2025, windows-latest] type: [Release, Debug] config: - msystem: "MINGW64" @@ -39,11 +39,6 @@ jobs: git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc - - msystem: "MINGW32" - install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja - mingw-w64-i686-gcc - runs-on: ${{matrix.os}} name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" diff --git a/README.md b/README.md index 880411e..b6197f8 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![coverage](https://coveralls.io/repos/github/red0124/ssp/badge.svg?branch=master)](https://coveralls.io/github/red0124/ssp?branch=master) -[![fuzz](https://github.com/red0124/ssp/workflows/fuzz-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/fuzz.yml) -[![single-header](https://github.com/red0124/ssp/workflows/single-header-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/single-header.yml) -[![ubuntu-latest-gcc](https://github.com/red0124/ssp/workflows/ubuntu-latest-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-gcc.yml) -[![ubuntu-latest-clang](https://github.com/red0124/ssp/workflows/ubuntu-latest-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-clang.yml) -[![windows-msys2-gcc](https://github.com/red0124/ssp/workflows/win-msys2-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-gcc.yml) -[![windows-msys2-clang](https://github.com/red0124/ssp/workflows/win-msys2-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-clang.yml) -[![windows-msvc](https://github.com/red0124/ssp/workflows/win-msvc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msvc.yml) -[![macos-apple-clang](https://github.com/red0124/ssp/workflows/macos-apple-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/macos-apple-clang.yml) +[![fuzz](https://github.com/red0124/ssp/workflows/fuzz-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/fuzz.yml) +[![single-header](https://github.com/red0124/ssp/workflows/single-header-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/single-header.yml) +[![ubuntu-latest-gcc](https://github.com/red0124/ssp/workflows/ubuntu-latest-gcc-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-gcc.yml) +[![ubuntu-latest-clang](https://github.com/red0124/ssp/workflows/ubuntu-latest-clang-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-clang.yml) +[![windows-msys2-gcc](https://github.com/red0124/ssp/workflows/win-msys2-gcc-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/win-msys2-gcc.yml) +[![windows-msys2-clang](https://github.com/red0124/ssp/workflows/win-msys2-clang-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/win-msys2-clang.yml) +[![windows-msvc](https://github.com/red0124/ssp/workflows/win-msvc-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/win-msvc.yml) +[![macos-apple-clang](https://github.com/red0124/ssp/workflows/macos-apple-clang-ci/badge.svg?branch=master)](https://github.com/red0124/ssp/actions/workflows/macos-apple-clang.yml) A header only CSV parser which is fast and versatile with modern C++ API. Requires compiler with C++17 support. [Can also be used to efficiently convert strings to specific types.](#the-converter) diff --git a/script/ci_install_deps.sh b/script/ci_install_deps.sh index 6ed958e..e85b3d0 100755 --- a/script/ci_install_deps.sh +++ b/script/ci_install_deps.sh @@ -1,9 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash JOBS=4 BUILD_TYPE=Debug -set -eux +set -ex git clone https://github.com/red0124/doctest -b master --depth 1 @@ -12,6 +12,10 @@ cmake -S doctest -B doctest/build \ -D DOCTEST_WITH_MAIN_IN_STATIC_LIB=NO \ -D DOCTEST_WITH_TESTS=NO -cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +if [[ "${1}" == "sudo" ]]; then + sudo cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +else + cmake --build doctest/build --config ${BUILD_TYPE} --target install -j ${JOBS} +fi rm -rf doctest diff --git a/script/ci_install_icc.sh b/script/ci_install_icc.sh deleted file mode 100755 index d719f6f..0000000 --- a/script/ci_install_icc.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT - -URL=$1 -COMPONENTS=$2 - -curl --output webimage.sh --url "$URL" --retry 5 --retry-delay 5 -chmod +x webimage.sh -./webimage.sh -x -f webimage_extracted --log extract.log -rm -rf webimage.sh -WEBIMAGE_NAME=$(ls -1 webimage_extracted/) -if [ -z "$COMPONENTS" ]; then - webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --continue-with-optional-error=yes --log-dir=. - installer_exit_code=$? -else - webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --continue-with-optional-error=yes --log-dir=. - installer_exit_code=$? -fi -rm -rf webimage_extracted -exit $installer_exit_code diff --git a/script/ci_setup_icc.sh b/script/ci_setup_icc.sh deleted file mode 100755 index d17d89b..0000000 --- a/script/ci_setup_icc.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT - -#shellcheck disable=SC2010 -LATEST_VERSION=$(ls -1 /opt/intel/oneapi/compiler/ | grep -v latest | sort | tail -1) -# shellcheck source=/dev/null -source /opt/intel/oneapi/compiler/"$LATEST_VERSION"/env/vars.sh -CXX=dpcpp