Skip to content

Commit 3195410

Browse files
Use the new -y option
1 parent 41f59d1 commit 3195410

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

.github/workflows/configure_qt.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,25 +125,18 @@ jobs:
125125
# sudo apt-get install clang clang-11 clang-tools-11 clang-11-doc libclang-common-11-dev libclang-11-dev libclang1-11 clang-format-11 clangd-11
126126
# sudo apt-get install libc++ libc++-11-dev libc++abi-11-dev
127127

128-
- name: 1. [MacOS] Install Dependencies
129-
if: startsWith(matrix.config.os, 'macos')
130-
#shell: bash
131-
run: /bin/bash -c "yes | ./update.sh -i -w ${{ matrix.config.work_dir }}"
128+
- name: 1. [All] Install Dependencies
129+
shell: bash
130+
run: ./update.sh -y -i -w ${{ matrix.config.work_dir }}
132131

133132
- name: 1. [MacOS] Fix Path
134133
if: startsWith(matrix.config.os, 'macos')
135134
shell: bash
136135
run: echo "/usr/local/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
137136

138-
- name: 2. [MacOS] Build up the environment
139-
if: startsWith(matrix.config.os, 'macos')
140-
#shell: bash
141-
run: /bin/bash -c "yes | ./update.sh -e -x -r -s -w ${{ matrix.config.work_dir }}"
142-
143137
- name: 2. [All] Build up the environment
144-
if: startsWith(matrix.config.os, 'macos') == false
145138
shell: bash
146-
run: bash -c "yes || true" | bash update.sh -e -x -r -s -w ${{ matrix.config.work_dir }}
139+
run: ./update.sh -y -e -x -r -s -w ${{ matrix.config.work_dir }}
147140

148141
# - name: 3. [All] Clean Work Directory
149142
# shell: bash
@@ -167,11 +160,11 @@ jobs:
167160
# run: |
168161
# python --version
169162
# which python
170-
# bash -c "yes || true" | bash update.sh -c -x -w ${{ matrix.config.work_dir }}
163+
# ./update.sh -y -c -x -w ${{ matrix.config.work_dir }}
171164

172165
# - name: 3. [All] Build Qt
173166
# shell: bash
174-
# run: bash -c "yes || true" | bash update.sh -q -x -r -j 4 -w ${{ matrix.config.work_dir }}
167+
# run: ./update.sh -y -q -x -r -j 4 -w ${{ matrix.config.work_dir }}
175168

176169
# - name: 5. [Windows] Make SDK toolchain zip
177170
# if: startsWith(matrix.config.os, 'windows') && steps.github-cache.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)