diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-11 13:47:56 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-11 13:47:56 +0000 |
| commit | e88e31dde2f51d6d5af9933e04952b9fa35eb718 (patch) | |
| tree | 8cc624c1e8193b73e4e9e623b8ad64156ca1c0d4 | |
| parent | f11dd83ab53f04fc8e5e20fd6815add6cf10ff58 (diff) | |
| parent | fb2e67638ddf72e416440bf59f311d76f71db502 (diff) | |
| download | gtk+-e88e31dde2f51d6d5af9933e04952b9fa35eb718.tar.gz | |
Merge branch 'balance-ci-jobs' into 'main'
ci: Balance the work between jobs
See merge request GNOME/gtk!5949
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | testsuite/gsk/misc.c | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 947c9e36ad..5a38c67b5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,19 +88,13 @@ fedora-x86_64: - export PATH="$HOME/.local/bin:$PATH" - meson subprojects download - meson subprojects update --reset - - mkdir _install - meson setup - --prefix=${CI_PROJECT_DIR}/_install ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - meson compile -C _build - - meson install -C _build - - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello - - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello - - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build wayland_gles @@ -115,13 +109,18 @@ release-build: - export PATH="$HOME/.local/bin:$PATH" - meson subprojects download - meson subprojects update --reset + - mkdir _install - meson setup + --prefix=${CI_PROJECT_DIR}/_install ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - meson compile -C _build + - meson install -C _build + - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello + - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello - .gitlab-ci/run-tests.sh _build x11 fedora-mingw64: diff --git a/testsuite/gsk/misc.c b/testsuite/gsk/misc.c index 26c23b2301..b2d72d77b7 100644 --- a/testsuite/gsk/misc.c +++ b/testsuite/gsk/misc.c @@ -172,11 +172,10 @@ const char shader1[] = "uniform float dots;// = 20.0;\n" "uniform vec2 center; //= vec2(0, 0);\n" "\n" -"uniform int test1 = -2;\n" -"uniform uint test2 = 2u; \n" -"uniform bool test3;\n" -"uniform vec3 test4;\n" -"uniform vec4 test5;\n" +"uniform int test1;\n" +"uniform bool test2;\n" +"uniform vec3 test3;\n" +"uniform vec4 test4;\n" "\n" "vec4 transition(vec2 uv) {\n" " bool nextImage = distance(fract(uv * dots), vec2(0.5, 0.5)) < ( progress / distance(uv, center));\n" @@ -228,8 +227,8 @@ test_renderer (GskRenderer *renderer) res = gsk_gl_shader_compile (shader, renderer, &error); if (GSK_IS_GL_RENDERER (renderer)) { - g_assert_true (res); g_assert_no_error (error); + g_assert_true (res); } else { |