From 976dcf36465236603f0c250a8370a9a226b90cdd Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 08:25:00 +0200 Subject: [PATCH 1/4] remove unintentionally added jobs from Draft pls also remove the up-to-date checks --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60e0ff523..9cba9de85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -860,7 +860,7 @@ uninterruptible: branch-is-up-to-date-with-target-pre: extends: - - .rules-merge-request + - .rules-merge-request-to-float-pc stage: prevalidate needs: [] tags: @@ -876,7 +876,7 @@ branch-is-up-to-date-with-target-pre: branch-is-up-to-date-with-target-post: extends: - - .rules-merge-request + - .rules-merge-request-to-float-pc stage: postvalidate tags: - ivas-linux @@ -1111,7 +1111,7 @@ build-codec-windows-msbuild: split-rendering-smoke-test: extends: - .test-job-linux - - .rules-merge-request + - .rules-merge-request-to-float-pc needs: ["build-codec-linux-make"] stage: test script: @@ -1135,7 +1135,7 @@ split-rendering-smoke-test: lc3-wrapper-unit-test: extends: - .test-job-linux - - .rules-merge-request + - .rules-merge-request-to-float-pc needs: ["build-codec-linux-make"] stage: test script: @@ -1150,7 +1150,7 @@ lc3-wrapper-unit-test: .split-rendering-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - - .rules-merge-request + - .rules-merge-request-to-float-pc needs: ["build-codec-linux-make"] # TODO: set reasonable timeout, will most likely take less timeout: "30 minutes" -- GitLab From cb2bdac2a18ff742c2694db35b3fb243e3d9c3ea Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 08:31:10 +0200 Subject: [PATCH 2/4] activate split rendering compare job for float-pc --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cba9de85..c5d755501 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1147,7 +1147,7 @@ lc3-wrapper-unit-test: - scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test # compare split-rendering bitexactness between target and source branch -.split-rendering-pytest-on-merge-request: +split-rendering-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request-to-float-pc -- GitLab From 088b80d5dd0f633e56eb99c4f56a4b49e6c441d8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 09:24:53 +0200 Subject: [PATCH 3/4] increase timeout of build jobs to be in line with main --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5d755501..1de1e5dff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1048,6 +1048,7 @@ build-codec-linux-make: - .build-job-linux tags: - ivas-linux + timeout: "10 minutes" script: - *print-common-info - *activate-Werror-linux @@ -1064,7 +1065,7 @@ build-codec-linux-instrumented-make: when: never extends: - .build-job-linux - timeout: "7 minutes" + timeout: "10 minutes" tags: - ivas-linux script: @@ -1080,6 +1081,7 @@ build-codec-sanitizers-linux: - .rules-basis tags: - ivas-linux + timeout: "10 minutes" script: - *update-scripts-repo - *print-common-info @@ -1096,7 +1098,7 @@ build-codec-windows-msbuild: when: never extends: - .build-job-windows - timeout: "7 minutes" + timeout: "10 minutes" tags: - ivas-windows script: -- GitLab From a75b7f0ee2b2056d29cdb4c7e81369ed48065486 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 09:56:07 +0200 Subject: [PATCH 4/4] dummy commit to trigger CI -- GitLab