Skip to content

Commit 601e833

Browse files
authored
Merge pull request #13 from VenimK/patch-3
Update generator-macos.yml
2 parents b605b0b + d584eed commit 601e833

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

.github/workflows/generator-macos.yml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -268,29 +268,6 @@ jobs:
268268
with:
269269
prefix-key: ${{ matrix.job.os }}
270270

271-
- name: Setup vcpkg with Github Actions binary cache
272-
uses: lukka/run-vcpkg@v11
273-
with:
274-
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
275-
doNotCache: false
276-
277-
- name: Install vcpkg dependencies
278-
run: |
279-
if ! $VCPKG_ROOT/vcpkg \
280-
install \
281-
--x-install-root="$VCPKG_ROOT/installed"; then
282-
find "${VCPKG_ROOT}/" -name "*.log" | while read -r _1; do
283-
echo "$_1:"
284-
echo "======"
285-
cat "$_1"
286-
echo "======"
287-
echo ""
288-
done
289-
exit 1
290-
fi
291-
head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true
292-
shell: bash
293-
294271
- name: Magick stuff for macOS
295272
if: ${{ inputs.iconlink != 'false' }}
296273
continue-on-error: false
@@ -478,14 +455,6 @@ jobs:
478455
run: |
479456
wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff
480457
git apply removeNewVersionNotif.diff
481-
482-
483-
- name: Install Rust toolchain
484-
uses: dtolnay/rust-toolchain@v1
485-
with:
486-
toolchain: ${{ env.MAC_RUST_VERSION }}
487-
targets: ${{ matrix.job.target }}
488-
components: "rustfmt"
489458
490459
- name: Report Status
491460
uses: fjogeleit/http-request-action@v1
@@ -810,4 +779,4 @@ jobs:
810779
# prerelease: true
811780
# tag_name: ${{ inputs.upload-tag }}
812781
# files: |
813-
# ${{ inputs.appname }}*-${{ matrix.job.arch }}.dmg
782+
# ${{ inputs.appname }}*-${{ matrix.job.arch }}.dmg

0 commit comments

Comments
 (0)