Skip to content

Commit cd803e2

Browse files
committed
Fix API workflow
1 parent 20ecc26 commit cd803e2

2 files changed

Lines changed: 29 additions & 79 deletions

File tree

.github/workflows-in/api.ys

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ python-preamble-job-win =::
1414
fail-fast: false
1515
matrix:
1616
config:
17-
- {pythonv: '3.13', os: windows-latest}
17+
- {pythonv: '3.13', os: windows-latest, vsenvarch: x64}
1818

1919

2020
setup-env-win =::
@@ -42,7 +42,9 @@ python-preamble-steps =::
4242

4343
defn python-wheel-steps(name create-wheel-cmd)::
4444
- name:: "------------------- $name"
45-
run: rm -rf build/ dist/
45+
run: |
46+
rm -rf build/ dist/ || echo "no files found"
47+
pip uninstall -y -v rapidyaml || echo "was not installed"
4648
- name:: "create wheel with $create-wheel-cmd"
4749
run:: |
4850
$create-wheel-cmd
@@ -70,13 +72,13 @@ python-bare-tests =::
7072
-D RYML_BUILD_TESTS=ON
7173
- name: build
7274
run: |
73-
cmake --build build/py -j -v --target ryml-api-python3
75+
cmake --build build/py -j -v --config Release --target ryml-api-python3
7476
cp -fv api/python/ryml/__init__.py build/py/api/python3/.
75-
ls -lFpAR build/py/api/python3/*
77+
ls -lFpAR build/py/api/python3/
7678
- name: test with ctest
7779
run: |
7880
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
79-
cmake --build build/py -j -v --target ryml-api-test-python3
81+
cmake --build build/py -j -v --config Release --target ryml-api-test-python3
8082
- name: test with pytest
8183
run: |
8284
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
@@ -102,15 +104,6 @@ jobs:
102104
- :: checkout-action
103105
- :: python-preamble-steps
104106
- :: python-bare-tests
105-
pybarewin:
106-
:: setup-job('api' 'pybarewin')
107-
name: pybare/${{matrix.config.pythonv}}/${{matrix.config.os}}
108-
:: python-preamble-job-win
109-
steps:
110-
- :: checkout-action
111-
- :: python-preamble-steps
112-
- :: setup-env-win
113-
- :: python-bare-tests
114107

115108
#----------------------------------------------------
116109
# run tests with built+installed wheels

.github/workflows/api.yml

Lines changed: 22 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -62,69 +62,13 @@ jobs:
6262
-D RYML_BUILD_TESTS=ON
6363
- name: build
6464
run: |
65-
cmake --build build/py -j -v --target ryml-api-python3
65+
cmake --build build/py -j -v --config Release --target ryml-api-python3
6666
cp -fv api/python/ryml/__init__.py build/py/api/python3/.
67-
ls -lFpAR build/py/api/python3/*
67+
ls -lFpAR build/py/api/python3/
6868
- name: test with ctest
6969
run: |
7070
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
71-
cmake --build build/py -j -v --target ryml-api-test-python3
72-
- name: test with pytest
73-
run: |
74-
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
75-
python -m pytest -vvv api/python/tests
76-
pybarewin:
77-
if: always()
78-
continue-on-error: false
79-
name: pybare/${{matrix.config.pythonv}}/${{matrix.config.os}}
80-
runs-on: ${{matrix.config.os}}
81-
strategy:
82-
fail-fast: false
83-
matrix:
84-
config:
85-
- pythonv: '3.13'
86-
os: windows-latest
87-
steps:
88-
- name: checkout (action)
89-
uses: actions/checkout@v4
90-
with:
91-
submodules: recursive
92-
fetch-depth: 0
93-
- name: install python ${{matrix.config.pythonv}}
94-
uses: actions/setup-python@v5
95-
with:
96-
python-version: ${{matrix.config.pythonv}}
97-
- name: deps
98-
run: |
99-
if [[ "${{matrix.config.os}}" == macos* ]] ; then
100-
brew install swig
101-
elif [[ "${{matrix.config.os}}" == windows* ]] ; then
102-
choco install swig
103-
fi
104-
pip install build deprecation pytest
105-
pip install -r requirements.txt
106-
- name: setup env (Visual Studio)
107-
uses: TheMrMilchmann/setup-msvc-dev@v3
108-
with:
109-
arch: ${{matrix.config.vsenvarch}}
110-
- name: configure
111-
run: |
112-
cmake -B build/py \
113-
-D CMAKE_BUILD_TYPE=Release \
114-
-D BUILD_SHARED_LIBS=ON \
115-
-D RYML_DEFAULT_CALLBACK_USES_EXCEPTIONS=ON \
116-
-D RYML_BUILD_API=ON \
117-
-D RYML_API_TESTS=ON \
118-
-D RYML_BUILD_TESTS=ON
119-
- name: build
120-
run: |
121-
cmake --build build/py -j -v --target ryml-api-python3
122-
cp -fv api/python/ryml/__init__.py build/py/api/python3/.
123-
ls -lFpAR build/py/api/python3/*
124-
- name: test with ctest
125-
run: |
126-
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
127-
cmake --build build/py -j -v --target ryml-api-test-python3
71+
cmake --build build/py -j -v --config Release --target ryml-api-test-python3
12872
- name: test with pytest
12973
run: |
13074
export PYTHONPATH=`pwd`/build/py/api/python3:$PYTHONPATH
@@ -164,7 +108,9 @@ jobs:
164108
pip install build deprecation pytest
165109
pip install -r requirements.txt
166110
- name: '------------------- using setup.py'
167-
run: rm -rf build/ dist/
111+
run: |
112+
rm -rf build/ dist/ || echo "no files found"
113+
pip uninstall -y -v rapidyaml || echo "was not installed"
168114
- name: create wheel with python setup.py bdist_wheel -v
169115
run: |
170116
python setup.py bdist_wheel -v
@@ -173,7 +119,9 @@ jobs:
173119
- name: test with pytest
174120
run: python -m pytest -vvv api/python/tests
175121
- name: '------------------- using pip'
176-
run: rm -rf build/ dist/
122+
run: |
123+
rm -rf build/ dist/ || echo "no files found"
124+
pip uninstall -y -v rapidyaml || echo "was not installed"
177125
- name: create wheel with pip wheel -w dist/ .
178126
run: |
179127
pip wheel -w dist/ .
@@ -182,7 +130,9 @@ jobs:
182130
- name: test with pytest
183131
run: python -m pytest -vvv api/python/tests
184132
- name: '------------------- using pypa/build'
185-
run: rm -rf build/ dist/
133+
run: |
134+
rm -rf build/ dist/ || echo "no files found"
135+
pip uninstall -y -v rapidyaml || echo "was not installed"
186136
- name: create wheel with python -m build --wheel
187137
run: |
188138
python -m build --wheel
@@ -201,6 +151,7 @@ jobs:
201151
config:
202152
- pythonv: '3.13'
203153
os: windows-latest
154+
vsenvarch: x64
204155
env:
205156
CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILES=ON
206157
steps:
@@ -227,7 +178,9 @@ jobs:
227178
with:
228179
arch: ${{matrix.config.vsenvarch}}
229180
- name: '------------------- using setup.py'
230-
run: rm -rf build/ dist/
181+
run: |
182+
rm -rf build/ dist/ || echo "no files found"
183+
pip uninstall -y -v rapidyaml || echo "was not installed"
231184
- name: create wheel with python setup.py bdist_wheel -v
232185
run: |
233186
python setup.py bdist_wheel -v
@@ -236,7 +189,9 @@ jobs:
236189
- name: test with pytest
237190
run: python -m pytest -vvv api/python/tests
238191
- name: '------------------- using pip'
239-
run: rm -rf build/ dist/
192+
run: |
193+
rm -rf build/ dist/ || echo "no files found"
194+
pip uninstall -y -v rapidyaml || echo "was not installed"
240195
- name: create wheel with pip wheel -w dist/ .
241196
run: |
242197
pip wheel -w dist/ .
@@ -245,7 +200,9 @@ jobs:
245200
- name: test with pytest
246201
run: python -m pytest -vvv api/python/tests
247202
- name: '------------------- using pypa/build'
248-
run: rm -rf build/ dist/
203+
run: |
204+
rm -rf build/ dist/ || echo "no files found"
205+
pip uninstall -y -v rapidyaml || echo "was not installed"
249206
- name: create wheel with python -m build --wheel
250207
run: |
251208
python -m build --wheel

0 commit comments

Comments
 (0)