Skip to content

Commit

Permalink
update vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
wyzdwdz committed May 6, 2024
1 parent 2b7e466 commit bc86ff7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 40 deletions.
32 changes: 0 additions & 32 deletions .github/macos/CMakeUserPresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@
"strategy": "external"
}
},
{
"name": "x86",
"hidden": true,
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x86-osx-release",
"CMAKE_SYSTEM_PROCESSOR": "x86",
"CMAKE_OSX_ARCHITECTURES": "x86",
"CMAKE_CROSSCOMPILING": "ON"
},
"architecture": {
"value": "x86",
"strategy": "external"
}
},
{
"name": "macos-x64",
"inherits": [
Expand All @@ -73,14 +59,6 @@
"arm64"
],
"binaryDir": "${sourceDir}/out/build/${presetName}"
},
{
"name": "macos-x86",
"inherits": [
"macos",
"x86"
],
"binaryDir": "${sourceDir}/out/build/${presetName}"
}
],
"buildPresets": [
Expand All @@ -103,16 +81,6 @@
"name": "macos-arm64-debug",
"configurePreset": "macos-arm64",
"configuration": "Debug"
},
{
"name": "macos-x86-release",
"configurePreset": "macos-x86",
"configuration": "Release"
},
{
"name": "macos-x86-debug",
"configurePreset": "macos-x86",
"configuration": "Debug"
}
]
}
7 changes: 0 additions & 7 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ jobs:
include:
- { arch: x86_64, profile: x64 }
- { arch: aarch64, profile: arm64 }
- { arch: i386, profile: x86 }
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -229,11 +228,6 @@ jobs:
uses: actions/download-artifact@v4
with:
name: release-macOS-aarch64

- name: download macOS i386
uses: actions/download-artifact@v4
with:
name: release-macOS-i386

- name: create zips
run: |
Expand Down Expand Up @@ -282,7 +276,6 @@ jobs:
sha256sum assfonts-${{ github.ref_name }}-i386-Windows.zip > assfonts-${{ github.ref_name }}-i386-Windows.zip.sha256sum
sha256sum assfonts-${{ github.ref_name }}-x86_64-macOS.dmg > assfonts-${{ github.ref_name }}-x86_64-macOS.dmg.sha256sum
sha256sum assfonts-${{ github.ref_name }}-aarch64-macOS.dmg > assfonts-${{ github.ref_name }}-aarch64-macOS.dmg.sha256sum
sha256sum assfonts-${{ github.ref_name }}-i386-macOS.dmg > assfonts-${{ github.ref_name }}-i386-macOS.dmg.sha256sum
- name: edit release
uses: svenstaro/upload-release-action@v2
Expand Down
2 changes: 1 addition & 1 deletion vcpkg

0 comments on commit bc86ff7

Please sign in to comment.