Skip to content

Commit 0027043

Browse files
committed
ci: truffleruby pipeline has better task names
1 parent be901fd commit 0027043

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

concourse/nokogiri-truffleruby.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
#! 2021-03-10 omit stable until the changes related to nokogiri are shipping in v22
77
#! #@ all_truffleruby_versions.extend(truffleruby_versions["supported"])
88

9-
#@ compile_flag_combos = ["--disable-system-libraries --disable-static",
10-
#@ "--disable-system-libraries --enable-static",
11-
#@ "--enable-system-libraries",
12-
#@ ]
9+
#@ compile_flag_combos = [["--disable-system-libraries", "--disable-static"],
10+
#@ ["--disable-system-libraries", "--enable-static"],
11+
#@ ["--enable-system-libraries"]]
1312

1413
---
1514
#@ def registry_image(image_repo, image_tag):
@@ -80,12 +79,14 @@ jobs:
8079
#@ if/end previous_job_name:
8180
passed: #@ [previous_job_name]
8281
#@ for compile_flags in compile_flag_combos:
83-
- task: rake-test
82+
#@ task_name = ["rake-test"]
83+
#@ task_name.extend(compile_flags)
84+
- task: #@ "_".join(task_name)
8485
config:
8586
"_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version)))
8687
inputs: [{name: ci}, {name: nokogiri}]
8788
params:
88-
COMPILE_FLAGS: #@ compile_flags
89+
COMPILE_FLAGS: #@ " ".join(compile_flags)
8990
run: { path: ci/concourse/tasks/rake-test/run.sh }
9091
#@ end
9192
#@ previous_job_name = job_name
@@ -104,12 +105,14 @@ jobs:
104105
#@ if/end previous_job_name:
105106
passed: #@ [previous_job_name]
106107
#@ for compile_flags in compile_flag_combos:
107-
- task: rake-test
108+
#@ task_name = ["rake-test"]
109+
#@ task_name.extend(compile_flags)
110+
- task: #@ "_".join(task_name)
108111
config:
109112
"_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version)))
110113
inputs: [{name: ci}, {name: nokogiri-pr, path: nokogiri}]
111114
params:
112-
COMPILE_FLAGS: #@ compile_flags
115+
COMPILE_FLAGS: #@ " ".join(compile_flags)
113116
run: { path: ci/concourse/tasks/rake-test/run.sh }
114117
#@ end
115118
#@ previous_job_name = job_name

concourse/nokogiri-truffleruby.yml.generated

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
platform: linux
2020
run:
2121
path: ci/concourse/tasks/rake-test/run.sh
22-
task: rake-test
22+
task: rake-test_--disable-system-libraries_--disable-static
2323
- config:
2424
image_resource:
2525
name: ""
@@ -35,7 +35,7 @@ jobs:
3535
platform: linux
3636
run:
3737
path: ci/concourse/tasks/rake-test/run.sh
38-
task: rake-test
38+
task: rake-test_--disable-system-libraries_--enable-static
3939
- config:
4040
image_resource:
4141
name: ""
@@ -51,7 +51,7 @@ jobs:
5151
platform: linux
5252
run:
5353
path: ci/concourse/tasks/rake-test/run.sh
54-
task: rake-test
54+
task: rake-test_--enable-system-libraries
5555
public: true
5656
- name: truffle-pr-nightly
5757
plan:
@@ -75,7 +75,7 @@ jobs:
7575
platform: linux
7676
run:
7777
path: ci/concourse/tasks/rake-test/run.sh
78-
task: rake-test
78+
task: rake-test_--disable-system-libraries_--disable-static
7979
- config:
8080
image_resource:
8181
name: ""
@@ -92,7 +92,7 @@ jobs:
9292
platform: linux
9393
run:
9494
path: ci/concourse/tasks/rake-test/run.sh
95-
task: rake-test
95+
task: rake-test_--disable-system-libraries_--enable-static
9696
- config:
9797
image_resource:
9898
name: ""
@@ -109,7 +109,7 @@ jobs:
109109
platform: linux
110110
run:
111111
path: ci/concourse/tasks/rake-test/run.sh
112-
task: rake-test
112+
task: rake-test_--enable-system-libraries
113113
public: true
114114
resource_types:
115115
- name: pull-request

0 commit comments

Comments
 (0)