Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge conda-forge/main into rapidsai/main (pt. 12) #64

Merged
merged 3 commits into from
May 29, 2024
Merged

Merge conda-forge/main into rapidsai/main (pt. 12) #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4003789
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] May 12, 2024
5c1e0fe
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and co…
regro-cf-autotick-bot May 29, 2024
35bff79
Merge conda-forge/main into rapidsai/main
jakirkham May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- rapidsai,rapidsai-nightly,conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ jobs:
runs-on: ubuntu-latest
name: automerge
steps:
- name: checkout
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@main
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/conda-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
- CONFIG: osx_64_
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-latest']
runs_on: ['macos-13']
- CONFIG: osx_arm64_
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-latest']
runs_on: ['macos-13']
- CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
UPLOAD_PACKAGES: True
os: windows
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
df -h

- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Build on Linux
if: matrix.os == 'ubuntu'
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
./.scripts/run_osx_build.sh

- name: Install Miniconda for windows
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-version: latest
miniforge-variant: Mambaforge
Expand Down