Skip to content

Commit

Permalink
upgrade to boost-1.184.0 and build macos-14 artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
justusranvier committed Jan 27, 2024
1 parent c9f0a13 commit 28d345b
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 81 deletions.
62 changes: 34 additions & 28 deletions .github/workflows/vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,54 @@ on: [push, pull_request]
jobs:
job:
name: ${{ matrix.platform }}-${{ github.workflow }}
runs-on: ${{ matrix.platform }}
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
platform: [macos-13, windows-2022]
platform: [macos-14-intel, macos-14-arm, windows-2022]
include:
- platform: macos-13
vcpkg: '/usr/local/share/vcpkg'
triplet: 'x64-osx-13'
- platform: macos-14-intel
runner: 'macos-13-large'
vcpkg: '${{ github.workspace }}/vcpkg'
triplet: 'x64-osx-14'
- platform: macos-14-arm
runner: 'macos-13-xlarge'
vcpkg: '${{ github.workspace }}/vcpkg'
triplet: 'arm64-osx-14'
- platform: windows-2022
runner: 'windows-2022-xl8'
vcpkg: 'C:\vcpkg'
triplet: 'x64-windows'
env:
VCPKG_COMMIT_ID: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00'
VCPKG_COMMIT_ID: '8ccb84df727bdf83045e53c319af05c554838b80'
VCPKG_ROOT: '${{ matrix.vcpkg }}'
VCPKG_INSTALLED_DIR: '${{ github.workspace }}/deps/vcpkg_installed/${{ matrix.platform }}'
VCPKG_DEFAULT_TRIPLET: '${{ matrix.triplet }}'
VCPKG_OVERLAY_TRIPLETS: '${{ github.workspace }}/overlay/triplets'
VCPKG_OVERLAY_PORTS: '${{ github.workspace }}/overlay/ports'
steps:
- name: Get more disk space
run: |
rm -rvf '${GOROOT_1_17_X64}'
rm -rvf '${GOROOT_1_18_X64}'
rm -rvf '${GOROOT_1_19_X64}'
rm -rvf '${JAVA_HOME_11_X64}'
rm -rvf '${JAVA_HOME_13_X64}'
rm -rvf '${JAVA_HOME_17_X64}'
rm -rvf '${JAVA_HOME_8_X64}'
rm -rvf '${{ matrix.vcpkg }}'
rm -rvf '/Users/runner/Library/Android'
rm -rvf 'C:\Android'
rm -rvf 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools'
rm -rvf 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
rm -rvf 'C:\Program Files\dotnet'
rm -rvf 'C:\Program Files\dotnet'
rm -rvf 'C:\SeleniumWebDrivers'
rm -rvf 'C:\selenium'
rm -rvf 'C:\tools\Apache24'
rm -rvf 'C:\tools\nginx-1.23.1'
shell: bash
continue-on-error: true
# - name: Get more disk space
# run: |
# rm -rvf '${GOROOT_1_17_X64}'
# rm -rvf '${GOROOT_1_18_X64}'
# rm -rvf '${GOROOT_1_19_X64}'
# rm -rvf '${JAVA_HOME_11_X64}'
# rm -rvf '${JAVA_HOME_13_X64}'
# rm -rvf '${JAVA_HOME_17_X64}'
# rm -rvf '${JAVA_HOME_8_X64}'
# rm -rvf '${{ matrix.vcpkg }}'
# rm -rvf '/Users/runner/Library/Android'
# rm -rvf 'C:\Android'
# rm -rvf 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools'
# rm -rvf 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
# rm -rvf 'C:\Program Files\dotnet'
# rm -rvf 'C:\Program Files\dotnet'
# rm -rvf 'C:\SeleniumWebDrivers'
# rm -rvf 'C:\selenium'
# rm -rvf 'C:\tools\Apache24'
# rm -rvf 'C:\tools\nginx-1.23.1'
# shell: bash
# continue-on-error: true
- name: Setup XCode
if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
Expand Down
2 changes: 1 addition & 1 deletion overlay
74 changes: 22 additions & 52 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,86 +4,55 @@
"name": "opentxs-dependency-builder",
"version": "1",
"dependencies": [
"boost-align",
"boost-any",
"boost-array",
"boost-algorithm",
{
"name": "boost-asio",
"features": [
"ssl"
]
},
"boost-assert",
"boost-atomic",
"boost-beast",
"boost-bind",
"boost-chrono",
"boost-circular-buffer",
"boost-concept-check",
"boost-config",
"boost-container",
"boost-container-hash",
"boost-context",
"boost-core",
"boost-coroutine",
"boost-describe",
"boost-detail",
"boost-date-time",
"boost-dynamic-bitset",
"boost-endian",
"boost-exception",
"boost-function",
"boost-fusion",
"boost-integer",
"boost-interprocess",
"boost-io",
"boost-intrusive",
"boost-iostreams",
"boost-iterator",
"boost-json",
"boost-lexical-cast",
"boost-logic",
"boost-math",
"boost-mp11",
"boost-mpl",
"boost-move",
"boost-multiprecision",
"boost-numeric-conversion",
"boost-optional",
"boost-parameter",
"boost-predef",
"boost-preprocessor",
"boost-program-options",
"boost-random",
"boost-range",
"boost-regex",
"boost-serialization",
"boost-smart-ptr",
"boost-stacktrace",
"boost-static-assert",
"boost-static-string",
"boost-system",
"boost-thread",
"boost-throw-exception",
"boost-tokenizer",
"boost-tuple",
"boost-type-index",
"boost-type-traits",
"boost-typeof",
"boost-ublas",
"boost-unordered",
"boost-variant2",
"boost-winapi",
"cmakerc",
"frozen",
"gtest",
"irrxml",
"libguarded",
"libsodium",
"lmdb",
"openssl",
"otcommon",
{
"name": "otcommon",
"version>=": "2.0.0"
},
"protobuf",
"pthread",
"qtbase",
{
"name": "pthread",
"platform": "windows"
},
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
"qtdeclarative",
"qtsvg",
"secp256k1",
"simpleini",
"sqlite3",
Expand All @@ -93,6 +62,7 @@
"features": [
"sodium"
]
}
},
"zlib"
]
}

0 comments on commit 28d345b

Please sign in to comment.