From 223d99b5d543b7e12396eb1beb1f744774a14c5f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:48:45 +0200 Subject: [PATCH 1/5] correct variable setting --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7d544e783..a3e86272ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4" OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3" OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" - OUT_FORMATS_ALL: "$OUT_FORMATS_ALL" + OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT" IVAS_PIPELINE_NAME: '' MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec." -- GitLab From 1bf5d61a3e6646efbca116c7a6d3835c97568af3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:52:28 +0200 Subject: [PATCH 2/5] add temporary job for checking variable setting --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3e86272ea..411df0cabe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -379,6 +379,16 @@ uninterruptible: # Validation jobs # --------------------------------------------------------------- +print-variables: + extends: + - .rules-merge-request + stage: prevalidate + needs: [] + tags: + - ivas-linux + script: + - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" + branch-is-up-to-date-with-main-pre: extends: - .rules-merge-request -- GitLab From f412c6617bb94c316a55a4713b90fa8a827c4c51 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:54:50 +0200 Subject: [PATCH 3/5] avoid colon in yaml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411df0cabe..44484d80dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -387,7 +387,7 @@ print-variables: tags: - ivas-linux script: - - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" + - echo "OUT_FORMATS_ALL - $OUT_FORMATS_ALL" branch-is-up-to-date-with-main-pre: extends: -- GitLab From ba16f102f666f4bc1fb2b1a0a9ac251259fd4ff1 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:55:51 +0200 Subject: [PATCH 4/5] Revert "avoid colon in yaml file" This reverts commit f412c6617bb94c316a55a4713b90fa8a827c4c51. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44484d80dc..411df0cabe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -387,7 +387,7 @@ print-variables: tags: - ivas-linux script: - - echo "OUT_FORMATS_ALL - $OUT_FORMATS_ALL" + - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" branch-is-up-to-date-with-main-pre: extends: -- GitLab From 9c44ca319fd8c3ecc15c2a6a2fae90e08cef4660 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:55:58 +0200 Subject: [PATCH 5/5] Revert "add temporary job for checking variable setting" This reverts commit 1bf5d61a3e6646efbca116c7a6d3835c97568af3. --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411df0cabe..a3e86272ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -379,16 +379,6 @@ uninterruptible: # Validation jobs # --------------------------------------------------------------- -print-variables: - extends: - - .rules-merge-request - stage: prevalidate - needs: [] - tags: - - ivas-linux - script: - - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" - branch-is-up-to-date-with-main-pre: extends: - .rules-merge-request -- GitLab