Skip to content

Commit 253749d

Browse files
committed
macos
1 parent 050f4b3 commit 253749d

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

.github/workflows/generator-macos.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,6 @@ jobs:
141141
repository: rustdesk/rustdesk
142142
submodules: recursive
143143

144-
- name: Restore bridge files
145-
uses: actions/download-artifact@master
146-
with:
147-
name: bridge-artifact
148-
path: ./
149-
150144
- name: Install imagemagick and potrace and nasm and and
151145
shell: bash
152146
run: |
@@ -249,7 +243,17 @@ jobs:
249243
url: ${{ env.STATUS_URL }}
250244
method: 'POST'
251245
customHeaders: '{"Content-Type": "application/json"}'
252-
data: '{"uuid": "${{ inputs.uuid }}", "status": "10% complete"}'
246+
data: '{"uuid": "${{ inputs.uuid }}", "status": "10% complete"}'
247+
248+
- name: Install build runtime
249+
run: |
250+
brew install llvm create-dmg
251+
# pkg-config is handled in a separate step, because it may be already installed by `macos-latest`(14.7.1) runner
252+
if command -v pkg-config &>/dev/null; then
253+
echo "pkg-config is already installed"
254+
else
255+
brew install pkg-config
256+
fi
253257
254258
- name: Install flutter
255259
uses: subosito/flutter-action@v2
@@ -278,7 +282,6 @@ jobs:
278282
targets: ${{ matrix.job.target }}
279283
components: "rustfmt"
280284

281-
282285
- uses: Swatinem/rust-cache@v2
283286
with:
284287
prefix-key: ${{ matrix.job.os }}
@@ -471,11 +474,6 @@ jobs:
471474
method: 'POST'
472475
customHeaders: '{"Content-Type": "application/json"}'
473476
data: '{"uuid": "${{ inputs.uuid }}", "status": "15% complete"}'
474-
475-
476-
- uses: Swatinem/rust-cache@v2
477-
with:
478-
prefix-key: ${{ matrix.job.os }}
479477

480478
- name: Report Status
481479
uses: fjogeleit/http-request-action@v1
@@ -485,6 +483,12 @@ jobs:
485483
customHeaders: '{"Content-Type": "application/json"}'
486484
data: '{"uuid": "${{ inputs.uuid }}", "status": "20% complete"}'
487485

486+
- name: Restore bridge files
487+
uses: actions/download-artifact@master
488+
with:
489+
name: bridge-artifact
490+
path: ./
491+
488492
- name: Setup vcpkg with Github Actions binary cache
489493
uses: lukka/run-vcpkg@v11
490494
with:
@@ -505,6 +509,7 @@ jobs:
505509
done
506510
exit 1
507511
fi
512+
head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true
508513
509514
- name: Report Status
510515
uses: fjogeleit/http-request-action@v1

0 commit comments

Comments
 (0)