mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[macos ci] update 2021-07-27 (#19207)
* update 2021-07-27 macOS -> 11.5.1, XCode -> 12.5.1 * update azure-pipelines * update sha of macfuse * change how macos-ci-base works * fix build errors * fix itpp:linux * more fixes * remove tab * allow version changes in all the remove/rename-version patches * fix libunistring for real * robert CR
This commit is contained in:
parent
bd5ea16b97
commit
ff190a561a
@ -10,6 +10,7 @@ if("public-preview" IN_LIST FEATURES)
|
||||
PATCHES
|
||||
improve-external-deps.patch
|
||||
fix-cmake.patch
|
||||
remove-werror.patch
|
||||
)
|
||||
else()
|
||||
vcpkg_from_github(
|
||||
@ -21,6 +22,7 @@ else()
|
||||
PATCHES
|
||||
improve-external-deps.patch
|
||||
fix-cmake.patch
|
||||
remove-werror.patch
|
||||
)
|
||||
endif()
|
||||
|
||||
|
18
ports/azure-iot-sdk-c/remove-werror.patch
Normal file
18
ports/azure-iot-sdk-c/remove-werror.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -34,14 +34,11 @@
|
||||
if (MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232")
|
||||
# Make warning as error
|
||||
- add_definitions(/WX)
|
||||
else()
|
||||
# Make warning as error
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||||
endif()
|
||||
|
||||
IF(WIN32)
|
||||
# windows needs this define
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "azure-iot-sdk-c",
|
||||
"version-date": "2020-12-09",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
|
||||
"homepage": "https://github.com/Azure/azure-iot-sdk-c",
|
||||
"dependencies": [
|
||||
|
13
ports/coroutine/add-noexcept-to-frame.patch
Normal file
13
ports/coroutine/add-noexcept-to-frame.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/interface/coroutine/frame.h
|
||||
+++ a/interface/coroutine/frame.h
|
||||
@@ -119,8 +119,8 @@
|
||||
return *this;
|
||||
}
|
||||
// 17.12.3.2, export/import
|
||||
- static /*constexpr*/ coroutine_handle from_address(void* _Addr) {
|
||||
+ static /*constexpr*/ coroutine_handle from_address(void* _Addr) noexcept {
|
||||
coroutine_handle _Result{};
|
||||
_Result._Ptr = reinterpret_cast<portable_coro_prefix*>(_Addr);
|
||||
return _Result;
|
||||
}
|
||||
|
@ -10,7 +10,9 @@ vcpkg_from_github(
|
||||
REF 1.5.0
|
||||
SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594
|
||||
HEAD_REF master
|
||||
PATCHES fix-errorC7651.patch
|
||||
PATCHES
|
||||
fix-errorC7651.patch
|
||||
add-noexcept-to-frame.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "coroutine",
|
||||
"version-string": "1.5.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "C++ 20 Coroutines helper/example library",
|
||||
"homepage": "https://github.com/luncliff/coroutine",
|
||||
"supports": "!uwp",
|
||||
|
@ -10,7 +10,9 @@ vcpkg_from_sourceforge(
|
||||
msvc2013.patch
|
||||
fix-uwp.patch
|
||||
fix-linux.patch
|
||||
rename-version.patch
|
||||
)
|
||||
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
|
12
ports/itpp/rename-version.patch
Normal file
12
ports/itpp/rename-version.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- a/autogen.sh
|
||||
+++ b/autogen.sh
|
||||
@@ -25,6 +25,6 @@
|
||||
|
||||
-PV=$(cat VERSION | cut -d' ' -f1)
|
||||
-LV=$(cat VERSION | cut -d' ' -f2)
|
||||
-if test "x$(cat VERSION | cut -d' ' -f3)" = "xsvn"; then
|
||||
+PV=$(cat VERSION.txt | cut -d' ' -f1)
|
||||
+LV=$(cat VERSION.txt | cut -d' ' -f2)
|
||||
+if test "x$(cat VERSION.txt | cut -d' ' -f3)" = "xsvn"; then
|
||||
if test -d ".git/svn"; then
|
||||
REV=$(LC_ALL=C git svn find-rev HEAD)
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "itpp",
|
||||
"version-semver": "4.3.1",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
|
||||
"homepage": "http://itpp.sourceforge.net"
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
Source: libodb-boost
|
||||
Version: 2.4.0-3
|
||||
Version: 2.4.0
|
||||
Port-Version: 4
|
||||
Description: Description: Boost support for the ODB ORM library
|
||||
Build-Depends: libodb
|
||||
|
@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/version")
|
||||
|
||||
file(COPY
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
|
||||
|
@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex(
|
||||
adapter_mysql_8.0.patch
|
||||
fix-redefinttion.patch
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/version")
|
||||
|
||||
file(COPY
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libodb-mysql",
|
||||
"version": "2.4.0",
|
||||
"port-version": 8,
|
||||
"port-version": 9,
|
||||
"description": "MySQL support for the ODB ORM library",
|
||||
"homepage": "https://www.codesynthesis.com/products/odb/",
|
||||
"dependencies": [
|
||||
|
@ -1,5 +1,6 @@
|
||||
Source: libodb-pgsql
|
||||
Version: 2.4.0-3
|
||||
Version: 2.4.0
|
||||
Port-Version: 4
|
||||
Homepage: https://www.codesynthesis.com/products/odb/
|
||||
Description: Description: PostgreSQL support for the ODB ORM library
|
||||
Build-Depends: libodb, libpq
|
||||
|
@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/version")
|
||||
|
||||
file(COPY
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
|
||||
|
@ -1,6 +1,6 @@
|
||||
Source: libodb-sqlite
|
||||
Version: 2.4.0
|
||||
Port-Version: 7
|
||||
Port-Version: 8
|
||||
Homepage: https://www.codesynthesis.com/products/odb/
|
||||
Description: Sqlite support for the ODB ORM library
|
||||
Build-Depends: libodb, sqlite3
|
||||
|
@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/version")
|
||||
|
||||
file(COPY
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
|
||||
|
@ -10,6 +10,7 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/version")
|
||||
|
||||
file(COPY
|
||||
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libodb",
|
||||
"version": "2.4.0",
|
||||
"port-version": 7,
|
||||
"port-version": 8,
|
||||
"description": "ODB library, base runtime for the ODB ORM solution",
|
||||
"homepage": "https://www.codesynthesis.com/products/odb/"
|
||||
}
|
||||
|
13
ports/libunistring/fix-for-automake-1.16.4.patch
Normal file
13
ports/libunistring/fix-for-automake-1.16.4.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/m4/init-package-version.m4
|
||||
+++ b/m4/init-package-version.m4
|
||||
@@ -82,9 +82,9 @@
|
||||
[AC_SUBST([PACKAGE], [$1])
|
||||
AC_SUBST([VERSION], [$2])
|
||||
])
|
||||
m4_define([AM_INIT_AUTOMAKE],
|
||||
m4_defn([gl_RPL_INIT_AUTOMAKE]))
|
||||
])
|
||||
-m4_define([gl_INIT_DUMMY], [])
|
||||
+m4_define([gl_INIT_DUMMY], [dummy])
|
||||
AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
|
||||
m4_ifval([$2],
|
@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
REF ${LIBUNISTRING_VERSION}
|
||||
PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef
|
||||
)
|
||||
|
||||
vcpkg_configure_make(
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libunistring",
|
||||
"version": "0.9.10",
|
||||
"port-version": 1,
|
||||
"description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.",
|
||||
"homepage": "https://www.gnu.org/software/libunistring/",
|
||||
"supports": "!windows",
|
||||
|
@ -1,6 +0,0 @@
|
||||
Source: nanodbc
|
||||
Version: 2.13.0
|
||||
Port-Version: 3
|
||||
Homepage: https://github.com/nanodbc/nanodbc
|
||||
Description: A small C++ wrapper for the native C ODBC API.
|
||||
Build-Depends: unixodbc(!windows)
|
@ -8,7 +8,9 @@ vcpkg_from_github(
|
||||
REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0
|
||||
SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45
|
||||
HEAD_REF master
|
||||
PATCHES rename-version.patch
|
||||
)
|
||||
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
|
||||
|
||||
if(DEFINED NANODBC_ODBC_VERSION)
|
||||
set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION})
|
||||
|
13
ports/nanodbc/rename-version.patch
Normal file
13
ports/nanodbc/rename-version.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,8 +20,8 @@
|
||||
########################################
|
||||
## nanodbc version
|
||||
########################################
|
||||
-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
|
||||
+file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
|
||||
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}")
|
||||
message(STATUS "nanodbc version: ${NANODBC_VERSION}")
|
||||
|
13
ports/nanodbc/vcpkg.json
Normal file
13
ports/nanodbc/vcpkg.json
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
"name": "nanodbc",
|
||||
"version": "2.13.0",
|
||||
"port-version": 4,
|
||||
"description": "A small C++ wrapper for the native C ODBC API.",
|
||||
"homepage": "https://github.com/nanodbc/nanodbc",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "unixodbc",
|
||||
"platform": "!windows"
|
||||
}
|
||||
]
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
Source: plplot
|
||||
Version: 5.13.0
|
||||
Port-Version: 9
|
||||
Build-Depends: freetype, zlib, libpng, bzip2
|
||||
Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.
|
||||
|
||||
Feature: wxwidgets
|
||||
Build-Depends: wxwidgets
|
||||
Description: plplot wxwidgets module
|
@ -25,10 +25,11 @@ vcpkg_configure_cmake(
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DENABLE_tcl=OFF
|
||||
-DPL_HAVE_QHULL=OFF
|
||||
-DENABLE_d=OFF
|
||||
-DENABLE_qt=OFF
|
||||
-DPLPLOT_USE_QT5=OFF
|
||||
-DENABLE_ocaml=OFF
|
||||
-DPL_HAVE_QHULL=OFF
|
||||
-DPLPLOT_USE_QT5=OFF
|
||||
-DPL_DOUBLE=ON
|
||||
-DPLD_wxwidgets=${BUILD_with_wxwidgets}
|
||||
-DENABLE_DYNDRIVERS=OFF
|
||||
|
20
ports/plplot/vcpkg.json
Normal file
20
ports/plplot/vcpkg.json
Normal file
@ -0,0 +1,20 @@
|
||||
{
|
||||
"name": "plplot",
|
||||
"version-string": "5.13.0",
|
||||
"port-version": 10,
|
||||
"description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.",
|
||||
"dependencies": [
|
||||
"bzip2",
|
||||
"freetype",
|
||||
"libpng",
|
||||
"zlib"
|
||||
],
|
||||
"features": {
|
||||
"wxwidgets": {
|
||||
"description": "plplot wxwidgets module",
|
||||
"dependencies": [
|
||||
"wxwidgets"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
@ -9,6 +9,7 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
disable_x86_intrinsics_on_arm.patch
|
||||
tiff-deprecated-typedefs.patch
|
||||
trivial-pixel.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
23
ports/selene/trivial-pixel.patch
Normal file
23
ports/selene/trivial-pixel.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- a/selene/img/pixel/Pixel.hpp
|
||||
+++ b/selene/img/pixel/Pixel.hpp
|
||||
@@ -45,6 +45,6 @@
|
||||
constexpr Pixel() noexcept = default; ///< Default constructor. Pixel values are uninitialized.
|
||||
|
||||
- template <typename... Args, typename = std::enable_if_t<sizeof...(Args) == nr_channels_>>
|
||||
- constexpr Pixel(Args... args) noexcept;
|
||||
+ template <typename Arg1, typename... Args, typename = std::enable_if_t<sizeof...(Args) + 1 == nr_channels_>>
|
||||
+ constexpr Pixel(Arg1 arg1, Args... args) noexcept;
|
||||
|
||||
constexpr explicit Pixel(const std::array<T, nr_channels>& arr) noexcept;
|
||||
@@ -216,8 +216,8 @@
|
||||
template <typename T, std::size_t nr_channels_, PixelFormat pixel_format_>
|
||||
-template <typename... Args, typename>
|
||||
-constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Args... args) noexcept
|
||||
- : data_{{static_cast<T>(args)...}}
|
||||
+template <typename Arg1, typename... Args, typename>
|
||||
+constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Arg1 arg1, Args... args) noexcept
|
||||
+ : data_{{static_cast<T>(arg1), static_cast<T>(args)...}}
|
||||
{
|
||||
static_assert(std::is_trivial<Pixel<T, nr_channels_, pixel_format_>>::value, "Pixel type is not trivial");
|
||||
static_assert(std::is_standard_layout<Pixel<T, nr_channels_, pixel_format_>>::value,
|
||||
"Pixel type is not standard layout");
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "selene",
|
||||
"version": "0.3.1",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "A C++17 image representation, processing and I/O library.",
|
||||
"homepage": "https://github.com/kmhofmann/selene",
|
||||
"dependencies": [
|
||||
|
@ -1,3 +0,0 @@
|
||||
Source: sentencepiece
|
||||
Version: v0.1.82
|
||||
Description: SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training
|
@ -8,7 +8,9 @@ vcpkg_from_github(
|
||||
REF v0.1.82
|
||||
SHA512 669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65
|
||||
HEAD_REF master
|
||||
PATCHES rename-version.patch
|
||||
)
|
||||
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
|
8
ports/sentencepiece/rename-version.patch
Normal file
8
ports/sentencepiece/rename-version.patch
Normal file
@ -0,0 +1,8 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -15,4 +15,4 @@
|
||||
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
|
||||
-file(STRINGS "VERSION" SPM_VERSION)
|
||||
+file(STRINGS "VERSION.txt" SPM_VERSION)
|
||||
message(STATUS "VERSION: ${SPM_VERSION}")
|
||||
project(sentencepiece VERSION ${SPM_VERSION} LANGUAGES CXX)
|
6
ports/sentencepiece/vcpkg.json
Normal file
6
ports/sentencepiece/vcpkg.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"name": "sentencepiece",
|
||||
"version": "0.1.82",
|
||||
"port-version": 1,
|
||||
"description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training"
|
||||
}
|
@ -1,5 +0,0 @@
|
||||
Source: xlnt
|
||||
Version: 1.5.0
|
||||
Port-Version: 1
|
||||
Homepage: https://github.com/tfussell/xlnt
|
||||
Description: Cross-platform user-friendly xlsx library for C++14
|
@ -14,6 +14,7 @@ vcpkg_from_github(
|
||||
"fix-not-found-include.patch"
|
||||
${win_patch}
|
||||
)
|
||||
file(REMOVE "${SOURCE_PATH}/third-party/libstudxml/version")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
set(STATIC OFF)
|
||||
|
7
ports/xlnt/vcpkg.json
Normal file
7
ports/xlnt/vcpkg.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"name": "xlnt",
|
||||
"version": "1.5.0",
|
||||
"port-version": 2,
|
||||
"description": "Cross-platform user-friendly xlsx library for C++14",
|
||||
"homepage": "https://github.com/tfussell/xlnt"
|
||||
}
|
@ -4,7 +4,7 @@
|
||||
variables:
|
||||
windows-pool: 'PrWin-2021-07-14'
|
||||
linux-pool: 'PrLin-2021-07-14'
|
||||
osx-pool: 'PrOsx-2021-04-16'
|
||||
osx-pool: 'PrOsx-2021-07-27'
|
||||
|
||||
stages:
|
||||
- stage: FormatChecks
|
||||
|
@ -155,18 +155,18 @@ Run the following commands:
|
||||
```sh
|
||||
$ cd ~/Parallels
|
||||
$ echo '{ "provider": "parallels" }' >metadata.json
|
||||
$ tar zgvf <current date>.box ./metadata.json ./<name of VM>.pvm
|
||||
$ tar zcvf <macos version>.box ./metadata.json ./<name of VM>.pvm
|
||||
```
|
||||
|
||||
This will create a box file which contains all the necessary data.
|
||||
You can delete the `metadata.json` file after.
|
||||
|
||||
Once you've done that, you can upload it to the fileshare,
|
||||
under `share/boxes/vcpkg-ci-base`, add it to `share/boxes/vcpkg-ci-base.json`,
|
||||
under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`,
|
||||
and finally add it to vagrant:
|
||||
|
||||
```sh
|
||||
$ vagrant box add ~/vagrant/share/boxes/vcpkg-ci-base.json
|
||||
$ vagrant box add ~/vagrant/share/boxes/macos-base.json
|
||||
```
|
||||
|
||||
Then, we'll create the final box,
|
||||
@ -184,9 +184,9 @@ $ vagrant package
|
||||
|
||||
This will create a `package.box`, which is the box file for the base VM.
|
||||
Once you've created this box, if you're making it the new box for the CI,
|
||||
upload it to the fileshare, under `share/boxes/vcpkg-ci`.
|
||||
upload it to the fileshare, under `share/boxes/macos-ci`.
|
||||
Then, add the metadata about the box (the name and version) to
|
||||
`share/boxes/vcpkg-ci.json`.
|
||||
`share/boxes/macos-ci.json`.
|
||||
Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions).
|
||||
|
||||
[base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html
|
||||
@ -199,6 +199,9 @@ Once you've done that, add the software versions under [VM Software Versions](#v
|
||||
* 2021-04-16:
|
||||
* macOS: 11.2.3
|
||||
* Xcode CLTs: 12.4
|
||||
* 2021-07-27:
|
||||
* macOS: 11.5.1
|
||||
* Xcode CLTs: 12.5.1
|
||||
|
||||
### (Internal) Accessing the macOS fileshare
|
||||
|
||||
|
@ -79,7 +79,7 @@ function Get-RemoteFile
|
||||
if ($actualHash.Hash -ne $Sha256) {
|
||||
throw @"
|
||||
Invalid hash for file $OutFile;
|
||||
expected: $Hash
|
||||
expected: $Sha256
|
||||
found: $($actualHash.Hash)
|
||||
Please make sure that the hash in the powershell file is correct.
|
||||
"@
|
||||
|
@ -14,9 +14,9 @@ jobs:
|
||||
value: /Users/vagrant/Data
|
||||
- name: VCPKG_DOWNLOADS
|
||||
value: /Users/vagrant/Data/downloads
|
||||
- group: osx-2021-04-16
|
||||
- group: osx-binary-caching-credentials
|
||||
- name: BINARY_SOURCE_STUB
|
||||
value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
|
||||
value: "x-azblob,$(root-url),$(sas)"
|
||||
- group: vcpkg-asset-caching-credentials
|
||||
- name: X_VCPKG_ASSET_SOURCES
|
||||
value: "x-azurl,$(root-url),$(sas),readwrite"
|
||||
|
@ -3,8 +3,7 @@ require 'json'
|
||||
configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json"))
|
||||
|
||||
Vagrant.configure('2') do |config|
|
||||
config.vm.box = 'vcpkg/macos-ci-base'
|
||||
config.vm.box_version = configuration['box_version']
|
||||
config.vm.box = 'vcpkg/macos-base'
|
||||
config.vm.synced_folder '.', '/Users/vagrant/shared'
|
||||
|
||||
config.vm.provision 'shell',
|
||||
|
@ -6,18 +6,18 @@
|
||||
"Name": "vagrant",
|
||||
"VersionCommand": [ "vagrant", "-v" ],
|
||||
"VersionRegex": "Vagrant (.*)",
|
||||
"Version": "2.2.15",
|
||||
"DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.dmg",
|
||||
"Sha256": "5C2B290C4FA2371E255C56B1E96DED3D0C838D54CB7F0E8E6CF154E9F206A20E",
|
||||
"Version": "2.2.18",
|
||||
"DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.18/vagrant_2.2.18_x86_64.dmg",
|
||||
"Sha256": "B4E8103AABDF29F18F592CD6DE4FA03BF182FBC192A0757B5E18156CB18FA672",
|
||||
"InstallerPath": "vagrant.pkg"
|
||||
},
|
||||
{
|
||||
"Name": "osxfuse",
|
||||
"VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ],
|
||||
"VersionRegex": "<key>CFBundleVersion</key>[\\n\\t ]*<string>([0-9.]+)</string>",
|
||||
"Version": "4.1.0",
|
||||
"DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.0/macfuse-4.1.0.dmg",
|
||||
"Sha256": "3CB6A49406FD036C50EF1B4AD717A377F4DCF182811BDE172D69F1C289791085",
|
||||
"Version": "4.1.2",
|
||||
"DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.2/macfuse-4.1.2.dmg",
|
||||
"Sha256": "9FF344DE38BAD5AC5ECA5194DA00A2BA35DD6AFDB9039133B5446168F8EDAFDB",
|
||||
"InstallerPath": "Install macFUSE.pkg"
|
||||
},
|
||||
{
|
||||
@ -34,7 +34,7 @@
|
||||
"VagrantPlugins": [
|
||||
{
|
||||
"Name": "vagrant-parallels",
|
||||
"Version": "2.2.1"
|
||||
"Version": "2.2.3"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "07dbca4b72d51fb97f55b032e1b412add4054973",
|
||||
"version-date": "2020-12-09",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "5dadcecafd0c3ffdfcf438c1f5f8b106002e14d0",
|
||||
"version-date": "2020-12-09",
|
||||
|
@ -282,7 +282,7 @@
|
||||
},
|
||||
"azure-iot-sdk-c": {
|
||||
"baseline": "2020-12-09",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"azure-kinect-sensor-sdk": {
|
||||
"baseline": "1.4.1",
|
||||
@ -1394,7 +1394,7 @@
|
||||
},
|
||||
"coroutine": {
|
||||
"baseline": "1.5.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"corrade": {
|
||||
"baseline": "2020.06",
|
||||
@ -2758,7 +2758,7 @@
|
||||
},
|
||||
"itpp": {
|
||||
"baseline": "4.3.1",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"ixwebsocket": {
|
||||
"baseline": "11.2.6",
|
||||
@ -3438,23 +3438,23 @@
|
||||
},
|
||||
"libodb": {
|
||||
"baseline": "2.4.0",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"libodb-boost": {
|
||||
"baseline": "2.4.0-3",
|
||||
"port-version": 0
|
||||
"baseline": "2.4.0",
|
||||
"port-version": 4
|
||||
},
|
||||
"libodb-mysql": {
|
||||
"baseline": "2.4.0",
|
||||
"port-version": 8
|
||||
"port-version": 9
|
||||
},
|
||||
"libodb-pgsql": {
|
||||
"baseline": "2.4.0-3",
|
||||
"port-version": 0
|
||||
"baseline": "2.4.0",
|
||||
"port-version": 4
|
||||
},
|
||||
"libodb-sqlite": {
|
||||
"baseline": "2.4.0",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"libogg": {
|
||||
"baseline": "1.3.5",
|
||||
@ -3706,7 +3706,7 @@
|
||||
},
|
||||
"libunistring": {
|
||||
"baseline": "0.9.10",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"liburing": {
|
||||
"baseline": "2.0",
|
||||
@ -4306,7 +4306,7 @@
|
||||
},
|
||||
"nanodbc": {
|
||||
"baseline": "2.13.0",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"nanoflann": {
|
||||
"baseline": "1.3.1",
|
||||
@ -4962,7 +4962,7 @@
|
||||
},
|
||||
"plplot": {
|
||||
"baseline": "5.13.0",
|
||||
"port-version": 9
|
||||
"port-version": 10
|
||||
},
|
||||
"plustache": {
|
||||
"baseline": "0.4.0-1",
|
||||
@ -5778,11 +5778,11 @@
|
||||
},
|
||||
"selene": {
|
||||
"baseline": "0.3.1",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"sentencepiece": {
|
||||
"baseline": "v0.1.82",
|
||||
"port-version": 0
|
||||
"baseline": "0.1.82",
|
||||
"port-version": 1
|
||||
},
|
||||
"sentry-native": {
|
||||
"baseline": "0.4.11",
|
||||
@ -6798,7 +6798,7 @@
|
||||
},
|
||||
"xlnt": {
|
||||
"baseline": "1.5.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"xlsxio": {
|
||||
"baseline": "2021-03-24",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "14f8ad97489e980329f98d4c95146dafb32cedb9",
|
||||
"version-string": "1.5.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "da458b763cbbbbba0acf20b1895ddd4ee4ff8d0b",
|
||||
"version-string": "1.5.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e10390b026b73c352e32bdf11ea58230a7e51d53",
|
||||
"version-semver": "4.3.1",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "ef6b3ce5f6b2522df8dc27959244a73581a44b6d",
|
||||
"version-semver": "4.3.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "facc25e5e4f72028b75da7be4b88208615b172cb",
|
||||
"version-string": "2.4.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "70c909cead2fcecc32b1be6da761fd8aaf74a95a",
|
||||
"version-string": "2.4.0-3",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bf081744ced44cfa3da6d34d959a63fdaacaf69f",
|
||||
"version": "2.4.0",
|
||||
"port-version": 9
|
||||
},
|
||||
{
|
||||
"git-tree": "208d05d2a1a41329632318e2950c1300cf75eb51",
|
||||
"version": "2.4.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "dfe9698df72847f118144c93dbcc25e2f0e0b16d",
|
||||
"version-string": "2.4.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "a16d0a534195ac98f6f44b21a42f626cbb5c9a6e",
|
||||
"version-string": "2.4.0-3",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d24a8283229f618903b2d446e7e22e4a0cf3f69f",
|
||||
"version-string": "2.4.0",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "6c3f8c74462e65898e335eef5ab9fabc0a3b222f",
|
||||
"version-string": "2.4.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8296035980f67a96a49e7277dc91149172555750",
|
||||
"version": "2.4.0",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "6be9a8547e11c2b30077c90504c6dc714f854076",
|
||||
"version": "2.4.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168",
|
||||
"version": "0.9.10",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "586bf47f6b9ee55aa3eb9ec7c7ff36363e39980b",
|
||||
"version": "0.9.10",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3549b9a15615f77ec718e9071309482707ad3779",
|
||||
"version": "2.13.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "2c22ba3957ee9a1a2c6d893c746b6a51bf38435c",
|
||||
"version-string": "2.13.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d3b92bbff064890556b4d4f759d2cea20041e79d",
|
||||
"version-string": "5.13.0",
|
||||
"port-version": 10
|
||||
},
|
||||
{
|
||||
"git-tree": "3a66c489f5aa8d94b9b171561bfe15b65fb71396",
|
||||
"version-string": "5.13.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a7e77d03f1d4e5a4d24e10c3ffc1ac326df1791e",
|
||||
"version": "0.3.1",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "414a898c6d7a263608c56e4bdddfc69936a6b9d7",
|
||||
"version": "0.3.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "80fecc6a62e7e634b59ec58f737202c0773fa73e",
|
||||
"version": "0.1.82",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "90b2ef495290ecbf5894d437a1d03d3735d9bf4d",
|
||||
"version-string": "v0.1.82",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e6bb2b46d0e6bf4e603c93c974bd2eb704e3a520",
|
||||
"version": "1.5.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "1e9127d56c2d772d64454b5aef80f93689f70242",
|
||||
"version-string": "1.5.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user