diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d08eed2..bfe3727 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,17 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 322c73b..bd24ee5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: -- '10.13' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 780a358..be060cb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc <(GitConfigurationKeyComparer.Instance); + +- IEnumerable lines = content.Split(['\n'], StringSplitOptions.RemoveEmptyEntries); ++ IEnumerable lines = content.Split('\n', StringSplitOptions.RemoveEmptyEntries); + + foreach (string line in lines) + { diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7645f45..716fd11 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "git-credential-manager" %} -{% set version = "2.7.0" %} +{% set version = "2.7.3" %} package: name: {{ name|lower }} @@ -7,9 +7,14 @@ package: source: url: https://github.com/GitCredentialManager/{{ name }}/archive/v{{ version }}.tar.gz - sha256: 9f7fc2b95cdf82c6bebeb045a553ed27c0130f426bc840e4f2dc41cbb27b6c31 + sha256: a9c1d7a89c620bea0df65623f25c62e66122d22557583ab390ed612d544884e9 patches: - 00000-no_self_contained.patch # [not aarch64 and not arm64] + # This fixes the call to string.Split(), needed for .NET 8.0 but not for .net 4.7. + # When the Windows version upgrades .NET version, + # we can apply this fix to all platforms. + # This fix is also tracked in the upstream. + - 00001-fix_ambiguous_call_to_string_split.patch # [not win] build: number: 0