Actions fixes for setup-dependencies/macOS and package/Windows (#4182)
This commit is contained in:
3
.github/actions/package/windows/action.yml
vendored
3
.github/actions/package/windows/action.yml
vendored
@@ -14,8 +14,7 @@ inputs:
|
|||||||
required: true
|
required: true
|
||||||
msystem:
|
msystem:
|
||||||
description: MSYS2 subsystem to use
|
description: MSYS2 subsystem to use
|
||||||
required: true
|
required: false
|
||||||
default: false
|
|
||||||
windows-codesign-cert:
|
windows-codesign-cert:
|
||||||
description: Certificate for signing Windows builds
|
description: Certificate for signing Windows builds
|
||||||
required: false
|
required: false
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ runs:
|
|||||||
echo "VCPKG_BINARY_SOURCES=clear;nuget,$FEED_URL,readwrite" >> "$GITHUB_ENV"
|
echo "VCPKG_BINARY_SOURCES=clear;nuget,$FEED_URL,readwrite" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Setup vcpkg environment
|
- name: Setup vcpkg environment
|
||||||
if: ${{ inputs.build-type == 'Debug' }}
|
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "CMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" >> "$GITHUB_ENV"
|
echo "CMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" >> "$GITHUB_ENV"
|
||||||
|
|||||||
Reference in New Issue
Block a user