Update generator-macos.yml
Removed Double VCPKG deps and install Removed Double Install Rust Toolchain
This commit is contained in:
31
.github/workflows/generator-macos.yml
vendored
31
.github/workflows/generator-macos.yml
vendored
@@ -268,29 +268,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
prefix-key: ${{ matrix.job.os }}
|
prefix-key: ${{ matrix.job.os }}
|
||||||
|
|
||||||
- name: Setup vcpkg with Github Actions binary cache
|
|
||||||
uses: lukka/run-vcpkg@v11
|
|
||||||
with:
|
|
||||||
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
|
|
||||||
doNotCache: false
|
|
||||||
|
|
||||||
- name: Install vcpkg dependencies
|
|
||||||
run: |
|
|
||||||
if ! $VCPKG_ROOT/vcpkg \
|
|
||||||
install \
|
|
||||||
--x-install-root="$VCPKG_ROOT/installed"; then
|
|
||||||
find "${VCPKG_ROOT}/" -name "*.log" | while read -r _1; do
|
|
||||||
echo "$_1:"
|
|
||||||
echo "======"
|
|
||||||
cat "$_1"
|
|
||||||
echo "======"
|
|
||||||
echo ""
|
|
||||||
done
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Magick stuff for macOS
|
- name: Magick stuff for macOS
|
||||||
if: ${{ inputs.iconlink != 'false' }}
|
if: ${{ inputs.iconlink != 'false' }}
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
@@ -479,14 +456,6 @@ jobs:
|
|||||||
wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff
|
wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff
|
||||||
git apply removeNewVersionNotif.diff
|
git apply removeNewVersionNotif.diff
|
||||||
|
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
|
||||||
uses: dtolnay/rust-toolchain@v1
|
|
||||||
with:
|
|
||||||
toolchain: ${{ env.MAC_RUST_VERSION }}
|
|
||||||
targets: ${{ matrix.job.target }}
|
|
||||||
components: "rustfmt"
|
|
||||||
|
|
||||||
- name: Report Status
|
- name: Report Status
|
||||||
uses: fjogeleit/http-request-action@v1
|
uses: fjogeleit/http-request-action@v1
|
||||||
with:
|
with:
|
||||||
|
|||||||
Reference in New Issue
Block a user