Skip to content

Commit 13af65d

Browse files
biojppmbiojppm
committed
wip
1 parent e55ab63 commit 13af65d

4 files changed

Lines changed: 48 additions & 168 deletions

File tree

‎.github/workflows-in/bash/install-configure.bash‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows-in/bash/install-preinstall.bash‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/workflows-in/install.ys‎

Lines changed: 48 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -23,124 +23,34 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
fp fl sh lcxx =:
27-
-['find_package' 'find_library' 'singleheader' 'linux/libcxx']
28-
t-t-i t-t-s =: -['test/test_install' 'test/test_singleheader']
29-
include:: -[
30-
{:name "$fp/linux", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'g++-13',
31-
:gen '-DCMAKE_CXX_COMPILER=g++-13', :tgt 'all', :bt 'Release',
32-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
33-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
34-
:commonvars nil}
35-
{:name "$fp/linux", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'g++-13',
36-
:gen '-DCMAKE_CXX_COMPILER=g++-13', :tgt 'all', :bt 'Debug',
37-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
38-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
39-
:commonvars nil}
40-
{:name "$fp/$lcxx", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'clang++-14',
41-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Release',
42-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
43-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
44-
:commonvars '-DRYML_USE_LIBCXX=ON'}
45-
{:name "$fp/$lcxx", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'clang++-14',
46-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Debug',
47-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
48-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
49-
:commonvars '-DRYML_USE_LIBCXX=ON'}
50-
{:name "$fp/macos", :sdir t-t-i, :os 'macos-13', :cxx 'xcode',
51-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
52-
:tgt 'ALL_BUILD', :bt 'Release',
53-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
54-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
55-
:commonvars nil}
56-
{:name "$fp/macos", :sdir t-t-i, :os 'macos-13', :cxx 'xcode',
57-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
58-
:tgt 'ALL_BUILD', :bt 'Debug',
59-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
60-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
61-
:commonvars nil}
62-
{:name "$fp/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
63-
:gen "-G 'Visual Studio 17 2022' -A x64",
64-
:tgt 'ALL_BUILD', :bt 'Release',
65-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake
66-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
67-
:commonvars nil}
68-
{:name "$fp/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
69-
:gen "-G 'Visual Studio 17 2022' -A x64",
70-
:tgt 'ALL_BUILD', :bt 'Debug',
71-
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake
72-
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
73-
:commonvars nil}
26+
include:
7427

75-
{:name "$fl/linux", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'g++-13',
76-
:gen '-DCMAKE_CXX_COMPILER=g++-13', :tgt 'all', :bt 'Release',
77-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
78-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
79-
:commonvars nil}
80-
{:name "$fl/linux", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'g++-13',
81-
:gen '-DCMAKE_CXX_COMPILER=g++-13', :tgt 'all', :bt 'Debug',
82-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
83-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
84-
:commonvars nil}
85-
{:name "$fl/$lcxx", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'clang++-14',
86-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Release',
87-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
88-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
89-
:commonvars '-DRYML_USE_LIBCXX=ON'}
90-
{:name "$fl/$lcxx", :sdir t-t-i, :os 'ubuntu-24.04', :cxx 'clang++-14',
91-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Debug',
92-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
93-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
94-
:commonvars '-DRYML_USE_LIBCXX=ON'}
95-
{:name "$fl/macos", :sdir t-t-i, :os 'macos-13', :cxx 'xcode',
96-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
97-
:tgt 'ALL_BUILD', :bt 'Release',
98-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
99-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
100-
:commonvars nil}
101-
{:name "$fl/macos", :sdir t-t-i, :os 'macos-13', :cxx 'xcode',
102-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
103-
:tgt 'ALL_BUILD', :bt 'Debug',
104-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
105-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
106-
:commonvars nil}
107-
{:name "$fl/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
108-
:gen "-G 'Visual Studio 17 2022' -A x64",
109-
:tgt 'ALL_BUILD', :bt 'Release',
110-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
111-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
112-
:commonvars nil}
113-
{:name "$fl/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
114-
:gen "-G 'Visual Studio 17 2022' -A x64",
115-
:tgt 'ALL_BUILD', :bt 'Debug',
116-
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
117-
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
118-
:commonvars nil}
28+
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
29+
- {name: find_package/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
30+
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
31+
- {name: find_package/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON, commonvars: -DRYML_USE_LIBCXX=ON}
32+
- {name: find_package/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
33+
- {name: find_package/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
34+
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
35+
- {name: find_package/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON}
11936

120-
{:name "$sh/linux", :sdir t-t-s, :os 'ubuntu-24.04', :cxx 'g++-13',
121-
:gen '-DCMAKE_CXX_COMPILER=g++-13',
122-
:tgt 'all', :bt 'Release', :vars nil, :commonvars nil}
123-
{:name "$sh/linux", :sdir t-t-s, :os 'ubuntu-24.04', :cxx 'g++-13',
124-
:gen '-DCMAKE_CXX_COMPILER=g++-13',
125-
:tgt 'all', :bt 'Debug', :vars nil, :commonvars nil}
126-
{:name "$sh/$lcxx", :sdir t-t-s, :os 'ubuntu-24.04', :cxx 'clang++-14',
127-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Release',
128-
:vars nil, :commonvars '-DRYML_USE_LIBCXX=ON'}
129-
{:name "$sh/$lcxx", :sdir t-t-s, :os 'ubuntu-24.04', :cxx 'clang++-14',
130-
:gen '-DCMAKE_CXX_COMPILER=clang++-14', :tgt 'all', :bt 'Debug',
131-
:vars nil, :commonvars '-DRYML_USE_LIBCXX=ON'}
132-
{:name "$sh/macos", :sdir t-t-s, :os 'macos-13', :cxx 'xcode',
133-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
134-
:tgt 'ALL_BUILD', :bt 'Release', :vars nil, :commonvars nil}
135-
{:name "$sh/macos", :sdir t-t-s, :os 'macos-13', :cxx 'xcode',
136-
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
137-
:tgt 'ALL_BUILD', :bt 'Debug', :vars nil, :commonvars nil}
138-
{:name "$sh/win", :sdir t-t-s, :os 'windows-2022', :cxx 'vs2022',
139-
:gen "-G 'Visual Studio 17 2022' -A x64",
140-
:tgt 'ALL_BUILD', :bt 'Release', :vars nil, :commonvars nil}
141-
{:name "$sh/win", :sdir t-t-s, :os 'windows-2022', :cxx 'vs2022',
142-
:gen "-G 'Visual Studio 17 2022' -A x64",
143-
:tgt 'ALL_BUILD', :bt 'Debug', :vars nil, :commonvars nil}]
37+
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
38+
- {name: find_library/linux, sdir: test/test_install, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
39+
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
40+
- {name: find_library/linux/libcxx, sdir: test/test_install, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF, commonvars: -DRYML_USE_LIBCXX=ON}
41+
- {name: find_library/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
42+
- {name: find_library/macos, sdir: test/test_install, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
43+
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
44+
- {name: find_library/win, sdir: test/test_install, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug, vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF}
45+
46+
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Release}
47+
- {name: singleheader/linux, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: g++-13, gen: -DCMAKE_CXX_COMPILER=g++-13, tgt: all, bt: Debug}
48+
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Release, commonvars: -DRYML_USE_LIBCXX=ON}
49+
- {name: singleheader/linux/libcxx, sdir: test/test_singleheader, os: ubuntu-24.04, cxx: clang++-14, gen: -DCMAKE_CXX_COMPILER=clang++-14, tgt: all, bt: Debug, commonvars: -DRYML_USE_LIBCXX=ON}
50+
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Release}
51+
- {name: singleheader/macos, sdir: test/test_singleheader, os: macos-13, cxx: xcode, gen: -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64, tgt: ALL_BUILD, bt: Debug}
52+
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Release}
53+
- {name: singleheader/win, sdir: test/test_singleheader, os: windows-2022, cxx: vs2022, gen: -G 'Visual Studio 17 2022' -A x64, tgt: ALL_BUILD, bt: Debug}
14454

14555
env:
14656
CXX_: ${{matrix.cxx}}
@@ -162,16 +72,28 @@ jobs:
16272
uses: actions/setup-python@v5
16373
with: { python-version: 3.9 }
16474
- name: preinstall
165-
run:: bash('install-preinstall')
75+
run: |
76+
if [ "${{matrix.sdir}}" == "test/test_install" ] ; then
77+
mkdir -p $BDIR-staging
78+
cmake -S . -B $BDIR-staging -DCMAKE_INSTALL_PREFIX=$PDIR -DCMAKE_BUILD_TYPE=${{matrix.bt}} ${{matrix.gen}} ${{matrix.commonvars}}
79+
cmake --build $BDIR-staging --config ${{matrix.bt}} --target ${{matrix.tgt}} -j
80+
cmake --build $BDIR-staging --config ${{matrix.bt}} --target install
81+
fi
16682
- name: configure
167-
run:: bash('install-configure')
83+
run: |
84+
mkdir -p $BDIR
85+
mkdir -p $IDIR
86+
cmake -S ${{matrix.sdir}} -B $BDIR \
87+
-DRYML_BUILD_TESTS=ON \
88+
-DRYML_VALGRIND=OFF \
89+
-DCMAKE_BUILD_TYPE=${{matrix.bt}} \
90+
-DCMAKE_INSTALL_PREFIX=$IDIR \
91+
${{matrix.gen}} \
92+
${{matrix.vars}} \
93+
${{matrix.commonvars}}
16894
- name: build
169-
run: >
170-
cmake --build $BDIR
171-
--config ${{matrix.bt}}
172-
--target ryml-test-build -j
95+
run: |
96+
cmake --build $BDIR --config ${{matrix.bt}} --target ryml-test-build -j
17397
- name: run
174-
run: >
175-
cmake --build $BDIR
176-
--config ${{matrix.bt}}
177-
--target ryml-test-run
98+
run: |
99+
cmake --build $BDIR --config ${{matrix.bt}} --target ryml-test-run

0 commit comments

Comments
 (0)