Skip to content

Commit 1f891d3

Browse files
aous72aous72
authored
Issues (#216)
Small touch ups to CI Tests. MSYS2 compiles correctly, but many tests fails.
1 parent 51c736f commit 1f891d3

File tree

2 files changed

+38
-259
lines changed

2 files changed

+38
-259
lines changed

‎.github/workflows/ccp-workflow.yml‎

Lines changed: 34 additions & 256 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: ${{ matrix.system }} Build
2121
runs-on: ${{ matrix.runner }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: cmake
2525
run: cmake -DOJPH_BUILD_STREAM_EXPAND=ON ..
2626
working-directory: build
@@ -38,7 +38,7 @@ jobs:
3838
name: ${{ matrix.system }} Build
3939
runs-on: ${{ matrix.runner }}
4040
steps:
41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v5
4242
- name: cmake
4343
run: cmake -DOJPH_BUILD_STREAM_EXPAND=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DOJPH_ENABLE_TIFF_SUPPORT=OFF ..
4444
working-directory: build
@@ -56,27 +56,32 @@ jobs:
5656
name: ${{ matrix.system }} Build
5757
runs-on: ${{ matrix.runner }}
5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v5
6060
- name: cmake
6161
run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
6262
working-directory: build
6363
- name: build
6464
run: cmake --build . --config Release
6565
working-directory: build
6666

67-
build_mingw:
67+
build_msys2:
6868
strategy:
6969
fail-fast: false
7070
matrix:
7171
include: [
72-
{ system: Windows-MinGW, runner: windows-latest },
72+
{ system: Windows-MSYS2, runner: windows-latest },
7373
]
7474
name: ${{ matrix.system }} Build
7575
runs-on: ${{ matrix.runner }}
7676
steps:
77-
- uses: actions/checkout@v4
77+
- uses: actions/checkout@v5
78+
- uses: msys2/setup-msys2@v2
79+
with:
80+
msystem: UCRT64
81+
update: true
82+
install: git mingw-w64-ucrt-x86_64-gcc
7883
- name: cmake
79-
run: cmake -G "MinGW Makefiles" -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
84+
run: cmake -G "MSYS Makefiles" -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
8085
working-directory: build
8186
- name: build
8287
run: cmake --build . --config Release
@@ -92,7 +97,7 @@ jobs:
9297
name: ${{ matrix.system }} Build
9398
runs-on: ${{ matrix.runner }}
9499
steps:
95-
- uses: actions/checkout@v4
100+
- uses: actions/checkout@v5
96101
- name: cmake
97102
run: cmake -G "Visual Studio 17 2022" -A ARM64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
98103
working-directory: build
@@ -112,7 +117,7 @@ jobs:
112117
name: ${{ matrix.system }} Test
113118
runs-on: ${{ matrix.runner }}
114119
steps:
115-
- uses: actions/checkout@v4
120+
- uses: actions/checkout@v5
116121
- name: cmake
117122
run: cmake -DOJPH_BUILD_TESTS=yes ..
118123
working-directory: build
@@ -133,7 +138,7 @@ jobs:
133138
name: ${{ matrix.system }} Test
134139
runs-on: ${{ matrix.runner }}
135140
steps:
136-
- uses: actions/checkout@v4
141+
- uses: actions/checkout@v5
137142
- name: cmake
138143
run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON ..
139144
working-directory: build
@@ -144,27 +149,39 @@ jobs:
144149
run: ctest --output-on-failure -C Release
145150
working-directory: build
146151

147-
# # MinGW tests needs debugging, as they are failing to pass in my test
148-
# test_MinGW:
152+
# # The code compiles but many tests fail --- Need to be revisited later ---
153+
# test_msys2:
149154
# strategy:
150155
# fail-fast: false
151156
# matrix:
152157
# include: [
153-
# { system: Windows, runner: windows-latest },
158+
# { system: Windows-MSYS2, runner: windows-latest },
154159
# ]
155160
# name: ${{ matrix.system }} Test
156161
# runs-on: ${{ matrix.runner }}
157162
# steps:
158-
# - uses: actions/checkout@v4
163+
# - uses: actions/checkout@v5
164+
# - uses: msys2/setup-msys2@v2
165+
# with:
166+
# msystem: UCRT64
167+
# update: true
168+
# install: git mingw-w64-ucrt-x86_64-clang mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-make
159169
# - name: cmake
160-
# run: cmake -G "MinGW Makefiles" -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON ..
170+
# run: cmake -G "MSYS Makefiles" -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release ..
161171
# working-directory: build
162172
# - name: build
163-
# run: cmake --build . --config Release
173+
# run: make -j
164174
# working-directory: build
175+
# - name: ls
176+
# run: dir tests
177+
# working-directory: build
178+
# - name: expand
179+
# run: ./ojph_expand.exe -i ./jp2k_test_codestreams/openjph/simple_dec_irv97_64x64.jph -o t.ppm
180+
# working-directory: build/tests
165181
# - name: test
166182
# run: ctest --output-on-failure -C Release
167183
# working-directory: build
184+
# continue-on-error: true
168185

169186
test_windows_on_arm:
170187
strategy:
@@ -176,7 +193,7 @@ jobs:
176193
name: ${{ matrix.system }} Test
177194
runs-on: ${{ matrix.runner }}
178195
steps:
179-
- uses: actions/checkout@v4
196+
- uses: actions/checkout@v5
180197
- name: cmake
181198
run: cmake -G "Visual Studio 17 2022" -A ARM64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON ..
182199
working-directory: build
@@ -187,242 +204,3 @@ jobs:
187204
run: ctest --output-on-failure -C Release
188205
working-directory: build
189206

190-
191-
#jobs:
192-
# ci:
193-
# name: ${{ matrix.name }}
194-
# runs-on: ${{ matrix.os }}
195-
#
196-
# strategy:
197-
# fail-fast: false
198-
# matrix:
199-
# # Github Actions requires a single row to be added to the build matrix.
200-
# # See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
201-
# name: [
202-
# ubuntu-18.04-gcc-4.8,
203-
# ubuntu-18.04-gcc-4.9,
204-
# ubuntu-18.04-gcc-5,
205-
# ubuntu-18.04-gcc-6,
206-
# ubuntu-18.04-gcc-7,
207-
# ubuntu-18.04-gcc-8,
208-
# ubuntu-18.04-gcc-9,
209-
# ubuntu-18.04-clang-3.5,
210-
# ubuntu-18.04-clang-3.6,
211-
# ubuntu-18.04-clang-3.7,
212-
# ubuntu-18.04-clang-3.8,
213-
# ubuntu-18.04-clang-3.9,
214-
# ubuntu-18.04-clang-4.0,
215-
# ubuntu-18.04-clang-5.0,
216-
# ubuntu-18.04-clang-6.0,
217-
# ubuntu-18.04-clang-7,
218-
# ubuntu-18.04-clang-8,
219-
# ubuntu-18.04-clang-9,
220-
# macOS-10.14-xcode-9.4.1,
221-
# macOS-10.14-xcode-10.0,
222-
# macOS-10.14-xcode-10.1,
223-
# macOS-10.14-xcode-10.2,
224-
# macOS-10.14-xcode-10.2.1,
225-
# macOS-10.14-xcode-10.3,
226-
# macOS-10.14-gcc-7,
227-
# macOS-10.14-gcc-8,
228-
# macOS-10.14-gcc-9,
229-
# ]
230-
#
231-
# include:
232-
# - name: ubuntu-18.04-gcc-4.8
233-
# os: ubuntu-18.04
234-
# compiler: gcc
235-
# version: "4.8"
236-
#
237-
# - name: ubuntu-18.04-gcc-4.9
238-
# os: ubuntu-18.04
239-
# compiler: gcc
240-
# version: "4.9"
241-
#
242-
# - name: ubuntu-18.04-gcc-5
243-
# os: ubuntu-18.04
244-
# compiler: gcc
245-
# version: "5"
246-
#
247-
# - name: ubuntu-18.04-gcc-6
248-
# os: ubuntu-18.04
249-
# compiler: gcc
250-
# version: "6"
251-
#
252-
# - name: ubuntu-18.04-gcc-7
253-
# os: ubuntu-18.04
254-
# compiler: gcc
255-
# version: "7"
256-
#
257-
# - name: ubuntu-18.04-gcc-8
258-
# os: ubuntu-18.04
259-
# compiler: gcc
260-
# version: "8"
261-
#
262-
# - name: ubuntu-18.04-gcc-9
263-
# os: ubuntu-18.04
264-
# compiler: gcc
265-
# version: "9"
266-
#
267-
# - name: ubuntu-18.04-clang-3.5
268-
# os: ubuntu-18.04
269-
# compiler: clang
270-
# version: "3.5"
271-
#
272-
# - name: ubuntu-18.04-clang-3.6
273-
# os: ubuntu-18.04
274-
# compiler: clang
275-
# version: "3.6"
276-
#
277-
# - name: ubuntu-18.04-clang-3.7
278-
# os: ubuntu-18.04
279-
# compiler: clang
280-
# version: "3.7"
281-
#
282-
# - name: ubuntu-18.04-clang-3.8
283-
# os: ubuntu-18.04
284-
# compiler: clang
285-
# version: "3.8"
286-
#
287-
# - name: ubuntu-18.04-clang-3.9
288-
# os: ubuntu-18.04
289-
# compiler: clang
290-
# version: "3.9"
291-
#
292-
# - name: ubuntu-18.04-clang-4.0
293-
# os: ubuntu-18.04
294-
# compiler: clang
295-
# version: "4.0"
296-
#
297-
# - name: ubuntu-18.04-clang-5.0
298-
# os: ubuntu-18.04
299-
# compiler: clang
300-
# version: "5.0"
301-
#
302-
# - name: ubuntu-18.04-clang-6.0
303-
# os: ubuntu-18.04
304-
# compiler: clang
305-
# version: "6.0"
306-
#
307-
# - name: ubuntu-18.04-clang-7
308-
# os: ubuntu-18.04
309-
# compiler: clang
310-
# version: "7"
311-
#
312-
# - name: ubuntu-18.04-clang-8
313-
# os: ubuntu-18.04
314-
# compiler: clang
315-
# version: "8"
316-
#
317-
# - name: ubuntu-18.04-clang-9
318-
# os: ubuntu-18.04
319-
# compiler: clang
320-
# version: "9"
321-
#
322-
# - name: macOS-10.14-xcode-9.4.1
323-
# os: macOS-10.14
324-
# compiler: xcode
325-
# version: "9.4.1"
326-
#
327-
# - name: macOS-10.14-xcode-10.0
328-
# os: macOS-10.14
329-
# compiler: xcode
330-
# version: "10"
331-
#
332-
# - name: macOS-10.14-xcode-10.1
333-
# os: macOS-10.14
334-
# compiler: xcode
335-
# version: "10.1"
336-
#
337-
# - name: macOS-10.14-Xcode-10.2
338-
# os: macOS-10.14
339-
# compiler: xcode
340-
# version: "10.2"
341-
#
342-
# - name: macOS-10.14-xcode-10.2.1
343-
# os: macOS-10.14
344-
# compiler: xcode
345-
# version: "10.2.1"
346-
#
347-
# - name: macOS-10.14-xcode-10.3
348-
# os: macOS-10.14
349-
# compiler: xcode
350-
# version: "10.3"
351-
#
352-
# - name: macOS-10.14-gcc-7
353-
# os: macOS-10.14
354-
# compiler: gcc
355-
# version: "7"
356-
#
357-
# - name: macOS-10.14-gcc-8
358-
# os: macOS-10.14
359-
# compiler: gcc
360-
# version: "8"
361-
#
362-
# - name: macOS-10.14-gcc-9
363-
# os: macOS-10.14
364-
# compiler: gcc
365-
# version: "9"
366-
#
367-
# steps:
368-
# - uses: actions/checkout@v2
369-
# - name: cmake
370-
# run: cmake ..
371-
# working-directory: build
372-
# - name: build
373-
# run: make
374-
# working-directory: build
375-
376-
377-
378-
# build1:
379-
# name: main build for Unix-like
380-
# runs-on: ${{ matrix.os }}
381-
# strategy:
382-
# matrix:
383-
# os: [macos-10.14, macos-latest, ubuntu-16.04, ubuntu-latest]
384-
# node: [8]
385-
# steps:
386-
# - uses: actions/checkout@v2
387-
# - name: cmake
388-
# run: cmake ..
389-
# working-directory: build
390-
# - name: build
391-
# run: make
392-
# working-directory: build
393-
#
394-
# build2:
395-
# name: main build for Windows
396-
# runs-on: ${{ matrix.os }}
397-
# strategy:
398-
# matrix:
399-
# os: [windows-latest]
400-
# node: [8]
401-
# steps:
402-
# - uses: actions/checkout@v2
403-
# - name: install visual studio
404-
# run: python install.py --clang-completer --ts-completer --msvc=14
405-
# - name: cmake
406-
# run: cmake -G "Visual Studio 14 2015 Win64" ..
407-
# working-directory: build
408-
# - name: build
409-
# run: cmake --build .
410-
# working-directory: build
411-
#
412-
# build3:
413-
# name: main build for Windows
414-
# runs-on: ${{ matrix.os }}
415-
# strategy:
416-
# matrix:
417-
# os: [windows-latest]
418-
# node: [8]
419-
# steps:
420-
# - uses: actions/checkout@v2
421-
# - name: install visual studio
422-
# run: python install.py --clang-completer --ts-completer --msvc=14
423-
# - name: cmake
424-
# run: cmake -G "Visual Studio 15 2017 Win64" ..
425-
# working-directory: build
426-
# - name: build
427-
# run: cmake --build .
428-
# working-directory: build

0 commit comments

Comments
 (0)