Skip to content

Commit c3a0bfc

Browse files
committed
Simplify corepack checks to == 25.1
Since there's no release between 25.1 and 26.0, and these steps only run for < 26.0, the >= 25.1 check was effectively just 25.1 anyway.
1 parent b2aebc5 commit c3a0bfc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tasks/_inc_client_build_steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
- name: Install packages with yarn
77
yarn:
8-
executable: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack ', '') }}yarn --network-timeout 300000 --check-files"
8+
executable: "{{ __galaxy_major_version is version('25.1', '==') | ternary('corepack ', '') }}yarn --network-timeout 300000 --check-files"
99
path: "{{ galaxy_server_dir }}/client"
1010
environment:
1111
PATH: "{{ galaxy_venv_dir }}/bin:{{ ansible_env.PATH }}"
@@ -31,7 +31,7 @@
3131
fail_msg: "Deconstructed client build is not supported for Galaxy version {{ __galaxy_major_version }}, please set 'galaxy_client_make_target'"
3232

3333
- name: Run gulp # noqa no-changed-when
34-
command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack yarn', 'yarn') }} run gulp {{ item }}"
34+
command: "{{ __galaxy_major_version is version('25.1', '==') | ternary('corepack yarn', 'yarn') }} run gulp {{ item }}"
3535
args:
3636
chdir: "{{ galaxy_server_dir }}/client"
3737
with_items: "{{ galaxy_client_build_steps[__galaxy_major_version] | default(galaxy_client_build_steps.default) }}"
@@ -54,7 +54,7 @@
5454
when: __galaxy_major_version is version('26.0', '>=')
5555

5656
- name: Run webpack # noqa no-changed-when
57-
command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack yarn', 'yarn') }} run webpack{{ (galaxy_client_node_env == 'production') | ternary('-production', '') }}"
57+
command: "{{ __galaxy_major_version is version('25.1', '==') | ternary('corepack yarn', 'yarn') }} run webpack{{ (galaxy_client_node_env == 'production') | ternary('-production', '') }}"
5858
args:
5959
chdir: "{{ galaxy_server_dir }}/client"
6060
environment:
@@ -77,7 +77,7 @@
7777
when: __galaxy_major_version is version('26.0', '>=')
7878

7979
- name: Stage built client
80-
command: "{{ __galaxy_major_version is version('25.1', '>=') | ternary('corepack yarn', 'yarn') }} run stage-build"
80+
command: "{{ __galaxy_major_version is version('25.1', '==') | ternary('corepack yarn', 'yarn') }} run stage-build"
8181
args:
8282
chdir: "{{ galaxy_server_dir }}/client"
8383
environment:

0 commit comments

Comments
 (0)