Skip to content

Commit af01e7b

Browse files
committed
Avoid using --progress plain on Windows
1 parent 9664752 commit af01e7b

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

dev/archery/archery/docker/core.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def _build(service, use_cache):
311311
self._execute_docker("buildx", "build", *args)
312312
elif self.config.using_docker:
313313
# better for caching
314-
if self.config.debug:
314+
if self.config.debug and os.name != "nt":
315315
args.append("--progress=plain")
316316
for k, v in service['build'].get('args', {}).items():
317317
args.extend(['--build-arg', '{}={}'.format(k, v)])
@@ -324,7 +324,7 @@ def _build(service, use_cache):
324324
])
325325
self._execute_docker("build", *args)
326326
else:
327-
if self.config.debug:
327+
if self.config.debug and os.name != "nt":
328328
args.append("--progress=plain")
329329
self._execute_compose("build", *args, service['name'])
330330

dev/tasks/macros.jinja

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
{%- macro github_header(archery_debug=True) -%}
18+
{%- macro github_header() -%}
1919
# NOTE: must set "Crossbow" as name to have the badge links working in the
2020
# github comment reports!
2121
name: Crossbow
@@ -25,9 +25,7 @@ on:
2525
- "*-github-*"
2626

2727
env:
28-
{% if archery_debug %}
2928
ARCHERY_DEBUG: 1
30-
{% endif %}
3129
ARCHERY_USE_DOCKER_CLI: 1
3230
{% endmacro %}
3331

dev/tasks/python-wheels/github.windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
{% import 'macros.jinja' as macros with context %}
1919

20-
{{ macros.github_header(archery_debug=False) }}
20+
{{ macros.github_header() }}
2121

2222
jobs:
2323
build:

0 commit comments

Comments
 (0)