diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index f533bda..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,41 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_: - CONFIG: win_64_ - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - timeoutInMinutes: 360 - variables: - UPLOAD_TEMP: D:\\tmp - - steps: - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - CI: azure - CONFIG: $(CONFIG) - CONDA_BLD_PATH: $(build_workspace_dir) - MINIFORGE_HOME: $(tools_install_dir) - PYTHONUNBUFFERED: 1 - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 6223fec..6decd5e 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -58,6 +58,17 @@ jobs: resize_partitions: False runs_on: ['ubuntu-latest'] tools_install_dir: ~/miniforge3 + - CONFIG: win_64_ + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge steps: - name: Checkout code diff --git a/README.md b/README.md index e0f8e9e..a10132e 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,6 @@ Current build status variant - - win_64 - - - variant - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03594e4..7e0f633 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,5 +28,4 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/conda-forge.yml b/conda-forge.yml index 8d48000..e870e95 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,4 +11,5 @@ github: provider: linux_aarch64: default osx_arm64: default + win_64: github_actions test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e7ec619..37bf89e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.6.0" %} +{% set version = "3.7.0" %} package: name: google-cloud-cpp-core @@ -6,12 +6,12 @@ package: source: url: https://github.com/googleapis/google-cloud-cpp/archive/v{{ version }}.tar.gz - sha256: 57d754883a4b4bead60e40f1db5e8a44ba2aa17b605eef56d85234839d5819a3 + sha256: 821367f21ec536431bf4fb5dc709a42794465506d7d3f8be40d52d493bcfdd06 patches: - patches/0001-Adapt-for-OpenTelemetry-1.25.patch build: - number: 1 + number: 0 requirements: build: