Skip to content

Commit 02c6c93

Browse files
authored
Merge pull request #127 from ckormanyos/simplify_ci
Simplify ci
2 parents 2c253b3 + e5209e2 commit 02c6c93

File tree

2 files changed

+16
-33
lines changed

2 files changed

+16
-33
lines changed

.github/workflows/soft_double.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ------------------------------------------------------------------------------
2-
# Copyright Christopher Kormanyos 2020 - 2024.
2+
# Copyright Christopher Kormanyos 2020 - 2025.
33
# Distributed under the Boost Software License,
44
# Version 1.0. (See accompanying file LICENSE_1_0.txt
55
# or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -108,50 +108,33 @@ jobs:
108108
echo
109109
echo "verify empty word count of ./tmp/all.tidy_txt"
110110
wc ./tmp/all.tidy_txt | grep '0 0 0'
111-
gcc-12-clang-14:
112-
runs-on: ubuntu-latest
113-
defaults:
114-
run:
115-
shell: bash
116-
strategy:
117-
fail-fast: false
118-
matrix:
119-
compiler: [ g++-12, clang++-14 ]
120-
standard: [ c++14, c++17, c++20 ]
121-
steps:
122-
- uses: actions/checkout@v4
123-
with:
124-
fetch-depth: '0'
125-
- name: update-tools
126-
run: sudo apt install g++-12 clang-14
127-
- name: gcc-clang-native
128-
run: |
129-
echo "compile ./soft_double.exe"
130-
${{ matrix.compiler }} -v
131-
${{ matrix.compiler }} -finline-functions -O3 -Werror -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wundef -Wunused-parameter -Wuninitialized -Wunreachable-code -Winit-self -Wzero-as-null-pointer-constant -march=native -O3 -std=${{ matrix.standard }} -I. examples/example001_roots_sqrt.cpp examples/example004_bessel_recur.cpp examples/example005_polylog_series.cpp examples/example007_catalan_series.cpp examples/example010_hypergeometric_2f1.cpp examples/example011_trig_trapezoid_integral.cpp examples/example012_exercise_constexpr.cpp test/test.cpp test/test_soft_double.cpp test/test_soft_double_edge_cases.cpp test/test_soft_double_examples.cpp test/test_soft_double_spot_values.cpp -o soft_double.exe
132-
ls -la ./soft_double.exe
133-
./soft_double.exe
134111
mingw-winhost-x64:
135-
runs-on: windows-2019
112+
runs-on: windows-latest
136113
defaults:
137114
run:
138-
shell: cmd
115+
shell: msys2 {0}
139116
strategy:
140117
fail-fast: false
141118
matrix:
142119
compiler: [ g++ ]
143-
standard: [ c++14, c++17, c++2a ]
120+
standard: [ c++14, c++20 ]
144121
steps:
145122
- uses: actions/checkout@v4
146123
with:
147124
fetch-depth: '0'
125+
- uses: msys2/setup-msys2@v2
126+
with:
127+
msystem: UCRT64
128+
update: true
129+
install: git mingw-w64-ucrt-x86_64-gcc
148130
- name: mingw-winhost-x64
131+
working-directory: ./
149132
run: |
150133
echo compile ./soft_double.exe
151134
${{ matrix.compiler }} -v
152135
${{ matrix.compiler }} -finline-functions -O3 -Werror -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wundef -Wunused-parameter -Wuninitialized -Wunreachable-code -Winit-self -Wzero-as-null-pointer-constant -m64 -std=${{ matrix.standard }} -I. examples/example001_roots_sqrt.cpp examples/example004_bessel_recur.cpp examples/example005_polylog_series.cpp examples/example007_catalan_series.cpp examples/example010_hypergeometric_2f1.cpp examples/example011_trig_trapezoid_integral.cpp examples/example012_exercise_constexpr.cpp test/test.cpp test/test_soft_double.cpp test/test_soft_double_edge_cases.cpp test/test_soft_double_examples.cpp test/test_soft_double_spot_values.cpp -o soft_double.exe
153-
dir .\soft_double.exe
154-
.\soft_double.exe
136+
ls -la ./soft_double.exe
137+
./soft_double.exe
155138
gcc-clang-native-asan:
156139
runs-on: ubuntu-latest
157140
defaults:

test/test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///////////////////////////////////////////////////////////////////
2-
// Copyright Christopher Kormanyos 2012 - 2024. //
2+
// Copyright Christopher Kormanyos 2012 - 2025. //
33
// Distributed under the Boost Software License, //
44
// Version 1.0. (See accompanying file LICENSE_1_0.txt //
55
// or copy at http://www.boost.org/LICENSE_1_0.txt) //
@@ -11,10 +11,10 @@
1111

1212
#include <test/test_soft_double_examples.h>
1313

14-
// cd /mnt/c/Users/User/Documents/Ks/PC_Software/NumericalPrograms/ExtendedNumberTypes/soft_double
14+
// cd /mnt/c/Users/ckorm/Documents/Ks/PC_Software/NumericalPrograms/ExtendedNumberTypes/soft_double
1515

1616
// Build locally for test on g++ with C++20.
17-
// g++ -finline-functions -march=native -mtune=native -O3 -Wall -Wextra --Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wundef -Wunused-parameter -Wuninitialized -Wunreachable-code -Winit-self -Wzero-as-null-pointer-constant -std=c++20 -I. examples/example001_roots_sqrt.cpp examples/example004_bessel_recur.cpp examples/example005_polylog_series.cpp examples/example007_catalan_series.cpp examples/example010_hypergeometric_2f1.cpp examples/example011_trig_trapezoid_integral.cpp examples/example012_exercise_constexpr.cpp test/test.cpp test/test_soft_double.cpp test/test_soft_double_edge_cases.cpp test/test_soft_double_examples.cpp test/test_soft_double_spot_values.cpp -o soft_double.exe
17+
// g++ -finline-functions -march=native -mtune=native -O3 -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wundef -Wunused-parameter -Wuninitialized -Wunreachable-code -Winit-self -Wzero-as-null-pointer-constant -std=c++20 -I. examples/example001_roots_sqrt.cpp examples/example004_bessel_recur.cpp examples/example005_polylog_series.cpp examples/example007_catalan_series.cpp examples/example010_hypergeometric_2f1.cpp examples/example011_trig_trapezoid_integral.cpp examples/example012_exercise_constexpr.cpp test/test.cpp test/test_soft_double.cpp test/test_soft_double_edge_cases.cpp test/test_soft_double_examples.cpp test/test_soft_double_spot_values.cpp -o soft_double.exe
1818

1919
// cd .tidy/make
2020
// make prepare -f make_tidy_01_generic.gmk
@@ -24,7 +24,7 @@
2424
// make prepare -f make_gcov_01_generic.gmk MY_ALL_COV=0 MY_CC=g++
2525
// make gcov -f make_gcov_01_generic.gmk --jobs=8 MY_ALL_COV=0 MY_CC=g++
2626

27-
// cd /mnt/c/Users/User/Documents/Ks/PC_Software/NumericalPrograms/ExtendedNumberTypes/soft_double
27+
// cd /mnt/c/Users/ckorm/Documents/Ks/PC_Software/NumericalPrograms/ExtendedNumberTypes/soft_double
2828
// PATH=/home/chris/coverity/cov-analysis-linux64-2023.6.2/bin:$PATH
2929
// cov-build --dir cov-int g++ -finline-functions -march=native -mtune=native -O3 -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wundef -Wunused-parameter -Wuninitialized -Wunreachable-code -Winit-self -Wzero-as-null-pointer-constant -std=c++14 -I. examples/example001_roots_sqrt.cpp examples/example004_bessel_recur.cpp examples/example005_polylog_series.cpp examples/example007_catalan_series.cpp examples/example010_hypergeometric_2f1.cpp examples/example011_trig_trapezoid_integral.cpp examples/example012_exercise_constexpr.cpp test/test.cpp test/test_soft_double.cpp test/test_soft_double_edge_cases.cpp test/test_soft_double_examples.cpp test/test_soft_double_spot_values.cpp -o soft_double.exe
3030
// tar caf soft_double.bz2 cov-int

0 commit comments

Comments
 (0)