Skip to content

Commit

Permalink
chore: Switch macos-14 to arm build
Browse files Browse the repository at this point in the history
Exclude couchbase from win-2022 build

Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Dec 12, 2024
1 parent 70ea56a commit e7ee664
Show file tree
Hide file tree
Showing 2 changed files with 148 additions and 8 deletions.
25 changes: 17 additions & 8 deletions .github/workflows/prebuild-gh_envs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
"ubuntu-22.04-x64",
"windows-2019-x64",
"windows-2022-x64",
"macos-12-x64",
"macos-13-x64"
"macos-13-x64",
"macos-14-arm64"
]
include:
- label: "ubuntu-20.04-x64"
Expand All @@ -51,16 +51,16 @@ jobs:
triplet: "x64-windows"
mono: ""
sudo: ""
- label: "macos-12-x64"
os: "macos-12"
triplet: "x64-osx"
mono: "mono"
sudo: "sudo"
- label: "macos-13-x64"
os: "macos-13"
triplet: "x64-osx"
mono: "mono"
sudo: "sudo"
- label: "macos-14-arm64"
os: "macos-14"
triplet: "arm64-osx"
mono: "mono"
sudo: "sudo"
fail-fast: false

name: "GH Environment - ${{ matrix.label }}"
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
sudo apt-get -yq install -f mono-complete
- name: OSX Dependencies
if: ${{ matrix.os == 'macos-12' || matrix.os == 'macos-13' }}
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' }}
shell: "bash"
run: |
brew install bison flex pkg-config automake libtool autoconf autoconf-archive coreutils
Expand Down Expand Up @@ -137,6 +137,14 @@ jobs:
setapikey "${{ secrets.GITHUB_TOKEN }}" \
-source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
- name: "Windows 2022 Manifest"
if: ${{ matrix.os == 'windows-2022' }}
working-directory: .
shell: "bash"
run: |
rm ./vcpkg.json
mv ./vcpkg-win2022.json ./vcpkg.json
- name: "Update nuget (overlays)"
working-directory: .
shell: "bash"
Expand All @@ -145,6 +153,7 @@ jobs:
--x-abi-tools-use-exact-versions \
--host-triplet=${{ matrix.triplet }} \
--triplet=${{ matrix.triplet }}
# ./vcpkg install --x-abi-tools-use-exact-versions --host-triplet=x64-windows --triplet=x64-windows

- name: Upload error logs
if: ${{ failure() || cancelled() }}
Expand Down
131 changes: 131 additions & 0 deletions vcpkg-win2022.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "hpcc-platform",
"version": "9.8.0",
"dependencies": [
"apr",
"apr-util",
{
"name": "aws-sdk-cpp",
"default-features": false,
"features": [
"s3",
"sqs"
]
},
{
"name": "arrow",
"default-features": false,
"features": [
"acero",
"dataset",
"filesystem",
"parquet"
],
"platform": "!(windows & x86)"
},
"azure-storage-blobs-cpp",
"azure-storage-files-shares-cpp",
"boost-circular-buffer",
"boost-property-tree",
"boost-regex",
"cpp-driver",
"cppunit",
"cpr",
"curl",
{
"name": "elasticlient",
"platform": "!windows"
},
"h3",
"hiredis",
{
"name": "icu",
"features": [
"tools"
]
},
"jsoncpp",
"jwt-cpp",
{
"name": "libarchive",
"default-features": false,
"features": [
"bzip2"
]
},
"libgit2",
{
"name": "libiconv",
"platform": "osx"
},
{
"name": "libmemcached",
"platform": "!windows & !osx"
},
{
"name": "libmysql",
"platform": "!(windows & x86)"
},
"librdkafka",
"libuv",
"libxml2",
{
"name": "libxslt",
"default-features": false,
"features": []
},
"libyaml",
"lz4",
"minizip",
"mongo-cxx-driver",
"nlohmann-json",
"nlp-engine",
{
"name": "numactl",
"platform": "!windows & !osx"
},
{
"name": "openblas",
"features": [
"dynamic-arch",
"threads"
],
"platform": "!windows"
},
{
"name": "openblas",
"features": [
"threads"
],
"platform": "windows"
},
{
"name": "openldap",
"platform": "!windows"
},
"openssl",
{
"name": "opentelemetry-cpp",
"default-features": false,
"features": [
"otlp-http",
"otlp-grpc"
]
},
"pcre2",
{
"name": "python3",
"platform": "windows"
},
"rapidjson",
"sqlite3",
"tbb",
"wasmtime-cpp-api",
{
"name": "winflexbison",
"platform": "windows"
},
"zlib"
]
}

0 comments on commit e7ee664

Please sign in to comment.