[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
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.

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

Explicitly use macos-13 for macOS Intel runners #13836

Merged
merged 2 commits into from
Apr 25, 2024

Conversation

jaimergp
Copy link
Contributor

Description

See conda-incubator/setup-miniconda#344.

Explicitly using macos-13 to ensure we do use Intel runners for osx-64 package building.

We will need conda-incubator/setup-miniconda#345 to work around issues with the underlying conda-build action.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Apr 23, 2024
Copy link
codspeed-hq bot commented Apr 23, 2024

CodSpeed Performance Report

Merging #13836 will not alter performance

Comparing jaimergp:macosrunners (84fb81b) with main (663dcd9)

Summary

✅ 21 untouched benchmarks

@jaimergp jaimergp mentioned this pull request Apr 24, 2024
3 tasks
@jezdez
Copy link
Member
jezdez commented Apr 25, 2024

https://github.com/conda-incubator/setup-miniconda/releases/tag/v3.0.4 has been released

@jaimergp jaimergp marked this pull request as ready for review April 25, 2024 13:40
@jaimergp jaimergp requested a review from a team as a code owner April 25, 2024 13:40
@jezdez jezdez enabled auto-merge (squash) April 25, 2024 14:04
@jezdez jezdez merged commit e85ef69 into conda:main Apr 25, 2024
66 checks passed
travishathaway added a commit that referenced this pull request May 7, 2024
* Add missing news for #13653 (#13711)

* add missing news for #13653

* Provide codesigned stub exe's (#13721)

Co-authored-by: Bianca Henderson <beeankha@gmail.com>

* Changelog 24.4.0 (#13847)

* Update .authors.yml

* Update .mailmap

* Update news

* Updated authorship for 24.4.0

* Updated CHANGELOG for 24.4.0

* Add first-time contributions

* Disable anaconda-anon-usage for CI. (#13803) (#13848)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Fix `pluggy 1.5.0` failure in tests (#13838) (#13849)

Co-authored-by: Ken Odegard <kodegard@anaconda.com>

* Bump conda-incubator/setup-miniconda in /.github/workflows (#13855)

Bumps [conda-incubator/setup-miniconda](https://github.com/conda-incubator/setup-miniconda) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/conda-incubator/setup-miniconda/releases)
- [Changelog](https://github.com/conda-incubator/setup-miniconda/blob/main/CHANGELOG.md)
- [Commits](conda-incubator/setup-miniconda@0301788...a426040)

---
updated-dependencies:
- dependency-name: conda-incubator/setup-miniconda
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump peter-evans/create-pull-request from 6.0.4 to 6.0.5 in /.github/workflows (#13856)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.4 to 6.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@9153d83...6d6857d)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* 🔄 synced file(s) with conda/infrastructure (#13857)

Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>

* Explicitly use macos-13 for macOS Intel runners (#13836)

* Bump conda/actions from 24.2.0 to 24.4.0 in /.github/workflows (#13858)

Bumps [conda/actions](https://github.com/conda/actions) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/conda/actions/releases)
- [Commits](conda/actions@f46142e...1e442e0)

---
updated-dependencies:
- dependency-name: conda/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump conda/actions from 24.2.0 to 24.4.0 in /.github/workflows (#13859)

Bumps [conda/actions](https://github.com/conda/actions) from 24.2.0 to 24.4.0.
- [Release notes](https://github.com/conda/actions/releases)
- [Commits](conda/actions@f46142e...1e442e0)

Refs #13858.

---
updated-dependencies:
- dependency-name: conda/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Explicitly use macos-13 for macOS Intel runners (#13836)

* Add arm64 review builds (#13845)

* Fix `conda env create/update --json` regression (#13860)

* Add test to check json output when creating envs with yaml file

* Add environment_with_pip.yml

* Reformat test, change import

---------

Co-authored-by: Ken Odegard <kodegard@anaconda.com>

* Pass CODECOV_TOKEN to codecov GitHub Action step. (#13867)

* Update test durations (#13873)

* [pre-commit.ci] pre-commit autoupdate (#13876)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.3.7 → v0.4.2](astral-sh/ruff-pre-commit@v0.3.7...v0.4.2)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Enable ruff --unsafe-fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Disable ruff --unsafe-fixes again

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Daniel Bast <2790401+dbast@users.noreply.github.com>

* Bump CodSpeedHQ/action from 2.3.1 to 2.4.0 in /.github/workflows (#13875)

* Bump CodSpeedHQ/action from 2.3.1 to 2.4.0 in /.github/workflows

Bumps [CodSpeedHQ/action](https://github.com/codspeedhq/action) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/codspeedhq/action/releases)
- [Changelog](https://github.com/CodSpeedHQ/action/blob/main/CHANGELOG.md)
- [Commits](CodSpeedHQ/action@aa99394...ac302de)

---
updated-dependencies:
- dependency-name: CodSpeedHQ/action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update .github/workflows/tests.yml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>

* Small typo fix (#13877)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Daniel Holth <dholth@anaconda.com>
Co-authored-by: Justin Wood (Callek) <callek@gmail.com>
Co-authored-by: Bianca Henderson <beeankha@gmail.com>
Co-authored-by: Jannis Leidel <jannis@leidel.info>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: conda-bot <18747875+conda-bot@users.noreply.github.com>
Co-authored-by: Conda Bot <conda-bot@users.noreply.github.com>
Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>
Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>
Co-authored-by: Daniel Bast <2790401+dbast@users.noreply.github.com>
Co-authored-by: Erik Whiting <erik@erikwhiting.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants