Skip to content

Commit 5b6b2dc

Browse files
update workflow
1 parent 6637103 commit 5b6b2dc

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

.github/workflows/qt5_6.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,10 @@ jobs:
6161
with:
6262
submodules: recursive
6363

64-
- name: 🔧 Prepare
64+
- name: 🔧 Append PR number to version (PR only)
65+
if: ${{ inputs.event_name == 'pull_request' }}
6566
shell: bash
66-
run: |
67-
echo '::group::Append PR number to version (PR only)'
68-
if [[ "${{ inputs.event_name }}" = "pull_request" ]]; then
69-
tr -d '\n' < .version > temp && mv temp .version
70-
echo -n "+PR${{ inputs.pull_request_number }}" >> .version
71-
fi
72-
echo '::endgroup::'
67+
run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
7368

7469
- name: 👷 Build
7570
shell: bash
@@ -127,26 +122,12 @@ jobs:
127122
uses: actions/cache@v4
128123
with:
129124
path: ~/Library/Caches/Homebrew/downloads
130-
key: ${{ runner.os }}-homebrew-packages-${{ inputs.qt_version }}
125+
key: ${{ runner.os }}-${{ matrix.architecture }}-homebrew-packages-${{ inputs.qt_version }}
131126

132127
- name: 📥 Install dependencies
133128
shell: bash
134129
run: brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
135130

136-
- name: 🔧 Prepare
137-
shell: bash
138-
run: |
139-
echo '::group::Append PR number to version (PR only)'
140-
if [[ "${{ inputs.event_name }}" = "pull_request" ]]; then
141-
tr -d '\n' < .version > temp && mv temp .version
142-
echo -n "+PR${{ inputs.pull_request_number }}" >> .version
143-
fi
144-
echo '::endgroup::'
145-
146-
echo '::group::Update/Install dependencies'
147-
brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
148-
echo '::endgroup::'
149-
150131
- name: 👷 Build
151132
shell: bash
152133
run: |
@@ -181,7 +162,7 @@ jobs:
181162
with:
182163
submodules: recursive
183164

184-
- name: 🔧 Prepare PR
165+
- name: 🔧 Append Pull Request number to version (PR only)
185166
if: ${{ inputs.event_name == 'pull_request' }}
186167
shell: bash
187168
run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version

0 commit comments

Comments
 (0)