diff --git a/.github/workflows/prebuild-gh_envs.yml b/.github/workflows/prebuild-gh_envs.yml index 5e194d4569f615..bedfe2c16cb1bc 100644 --- a/.github/workflows/prebuild-gh_envs.yml +++ b/.github/workflows/prebuild-gh_envs.yml @@ -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" @@ -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 }}" @@ -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 @@ -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" @@ -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() }} diff --git a/vcpkg-win2022.json b/vcpkg-win2022.json new file mode 100644 index 00000000000000..30cf721b0889f7 --- /dev/null +++ b/vcpkg-win2022.json @@ -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" + ] +} \ No newline at end of file