Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit79cea46

Browse files
committed
Updated CI jobs
New pattern for base docker images, and Windows now on a properrunning environment.
1 parent9c13496 commit79cea46

File tree

1 file changed

+42
-31
lines changed

1 file changed

+42
-31
lines changed

‎.gitlab-ci.yml‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,13 @@ variables:
2121

2222
.platform_windows_template:&platform_windows_template
2323
stage:Platform Tests
24+
image:stabletec/build-core:windows
2425
tags:
2526
-docker-windows
2627
script:
27-
-echo 'try {' | out-file -encoding utf8 build.ps1
28-
-echo 'cd ..; mkdir workdir-cpy' | out-file -encoding utf8 -append build.ps1
29-
-echo 'Copy-Item C:\workdir\* -Destination C:\workdir-cpy -Recurse' | out-file -encoding utf8 -append build.ps1
30-
-echo 'cd workdir-cpy' | out-file -encoding utf8 -append build.ps1
31-
-echo 'mkdir build; cd build' | out-file -encoding utf8 -append build.ps1
32-
-echo "cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release" | out-file -encoding utf8 -append build.ps1
33-
-echo 'if(-not $?){throw}' | out-file -encoding utf8 -append build.ps1
34-
-echo 'ninja' | out-file -encoding utf8 -append build.ps1
35-
-echo 'if(-not $?){throw}' | out-file -encoding utf8 -append build.ps1
36-
-echo '} catch { exit 1 }' | out-file -encoding utf8 -append build.ps1
37-
-docker run --rm -v ${pwd}:C:\workdir $env:IMAGE C:\workdir\build.ps1
28+
-mkdir build; cd build
29+
-cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
30+
-ninja
3831

3932
.platform_macos_template:&platform_macos_template
4033
stage:Platform Tests
@@ -45,56 +38,72 @@ variables:
4538
-mkdir build && cd build
4639
-cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release
4740
-ninja
48-
-ctest
4941

5042
Fedora/GCC:
51-
image:stabletec/build-core:fedora-gcc
43+
image:stabletec/build-core:fedora
44+
variables:
45+
CC:gcc
46+
CXX:g++
5247
<<:*platform_unix_template
5348

5449
Fedora/Clang:
55-
image:stabletec/build-core:fedora-clang
50+
image:stabletec/build-core:fedora
51+
variables:
52+
CC:clang
53+
CXX:clang++
5654
<<:*platform_unix_template
5755

5856
Debian/GCC:
59-
image:stabletec/build-core:debian-gcc
57+
image:stabletec/build-core:debian
58+
variables:
59+
CC:gcc
60+
CXX:g++
6061
<<:*platform_unix_template
6162

6263
Debian/Clang:
63-
image:stabletec/build-core:debian-clang
64+
image:stabletec/build-core:debian
65+
variables:
66+
CC:clang
67+
CXX:clang++
6468
<<:*platform_unix_template
6569

6670
Ubuntu/GCC:
67-
image:stabletec/build-core:ubuntu-gcc
71+
image:stabletec/build-core:ubuntu
72+
variables:
73+
CC:gcc
74+
CXX:g++
6875
<<:*platform_unix_template
6976

7077
Ubuntu/Clang:
71-
image:stabletec/build-core:ubuntu-clang
78+
image:stabletec/build-core:ubuntu
79+
variables:
80+
CC:clang
81+
CXX:clang++
7282
<<:*platform_unix_template
7383

7484
openSUSE/GCC:
75-
image:stabletec/build-core:opensuse-gcc
85+
image:stabletec/build-core:opensuse
86+
variables:
87+
CC:gcc
88+
CXX:g++
7689
<<:*platform_unix_template
7790

7891
openSUSE/Clang:
79-
image:stabletec/build-core:opensuse-clang
92+
image:stabletec/build-core:opensuse
93+
variables:
94+
CC:clang
95+
CXX:clang++
8096
<<:*platform_unix_template
8197

8298
Windows/MSVC:
83-
variables:
84-
IMAGE:stabletec/build-core:windows-msvc
8599
<<:*platform_windows_template
86100

87101
Windows/Clang-cl:
88102
variables:
89-
IMAGE:stabletec/build-core:windows-clang-cl
103+
CC:clang-cl
104+
CXX:clang-cl
90105
<<:*platform_windows_template
91106

92-
macOS/GCC:
93-
variables:
94-
CC:gcc
95-
CXX:g++
96-
<<:*platform_macos_template
97-
98107
macOS/Clang:
99108
variables:
100109
CC:clang
@@ -105,16 +114,18 @@ macOS/Clang:
105114

106115
.analysis_template:&analysis_template
107116
stage:Analysis
108-
image:stabletec/build-foe:fedora-clang
117+
image:stabletec/build-foe:fedora
109118
allow_failure:true
110119
tags:
111120
-docker-linux
112121
script:
113122
-mkdir build && cd build
114-
-cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release-DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DNO_VULKAN_DEVICE=ON -DBUILD_WINDOW_TESTS=OFF${CMAKE_OPTIONS}
123+
-cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release ${CMAKE_OPTIONS}
115124
-ninja
116125

117126
Static Analysis:
118127
variables:
119128
CMAKE_OPTIONS:-DCLANG_TIDY=ON -DCPPCHECK=ON
129+
CC:clang
130+
CXX:clang++
120131
<<:*analysis_template

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp