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

Jump to bottom

[macOS] Pin version for tcl/tk and pkg-config #10971

Merged
merged 1 commit into from
Nov 15, 2024
Merged

[macOS] Pin version for tcl/tk and pkg-config #10971

merged 1 commit into from
Nov 15, 2024

Conversation

sarathrajsrinivasan
Copy link
Contributor

Description

  1. Pin version for tcl/tk to 8.
  2. Pin version for pkg-config to 0.29.2. Check and migrate to "pkgconf" if basic functionality is identical.

Related issue:

Check list

  • Related issue / work item is attached
  • Tests are written (if applicable)
  • Documentation is updated (if applicable)
  • Changes are tested and related VM images are successfully generated

@sarathrajsrinivasan sarathrajsrinivasan self-assigned this Nov 14, 2024
erik-bershel
erik-bershel reviewed Nov 14, 2024
View reviewed changes
images/macos/toolsets/toolset-13.json Outdated
@@ -72,7 +72,6 @@
"p7zip",
"packer",
"perl",
"pkg-config",
"swiftformat",
"tcl-tk",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What will be changed if we just use a package with a version here instead of another condition? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could update as "tcl-tk@8" directly here as well..just thought this would be neat and similar format to earlier pinned versions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

earlier pinned versions

Ah, we simply didn't have the opportunity to pin it normally through the toolset - there are edge cases or methods that you can't call popular. It's better to control versioning through the toolset - it's the most visual file.

@sarathrajsrinivasan sarathrajsrinivasan force-pushed the macos-pin-tcl-pkgconf branch 2 times, most recently from 73e90c8 to 58e2f2e Compare November 15, 2024 04:39
@sureshe456 sureshe456 merged commit 5cd2ef1 into actions:main Nov 15, 2024
4 checks passed
@erik-bershel erik-bershel mentioned this pull request Nov 18, 2024
Closed
15 tasks
akoeplinger added a commit to dotnet/runtime that referenced this pull request Nov 19, 2024
@akoeplinger
Temporarily uninstall [email protected] in install-dependencies.sh
5a3b0fe 
This was added by AzDO in actions/runner-images#10971 as a workaround for actions/runner-images#10984, but that means the old package now conflicts with the new pkg-config which is an alias to pkgconf.

Fixes the build issues we've seen with OSX image version 20241119.505
@akoeplinger akoeplinger mentioned this pull request Nov 19, 2024
Merged
akoeplinger added a commit to dotnet/arcade that referenced this pull request Nov 19, 2024
@akoeplinger
Temporarily uninstall [email protected] in install-dependencies.sh
39483ad 
This was added by AzDO in actions/runner-images#10971 as a workaround for actions/runner-images#10984, but that means the old package now conflicts with the new pkg-config which is an alias to pkgconf.

Fixes the build issues we've seen with OSX image version 20241119.505
@akoeplinger akoeplinger mentioned this pull request Nov 19, 2024
Merged
akoeplinger added a commit to dotnet/runtime that referenced this pull request Nov 19, 2024
@akoeplinger
Temporarily uninstall [email protected] in install-dependencies.sh (#…
d4516bf 
…109968)

This was added by AzDO in actions/runner-images#10971 as a workaround for actions/runner-images#10984, but that means the old package now conflicts with the new pkg-config which is an alias to pkgconf.

Fixes the build issues we've seen with OSX image version 20241119.505
@teo-tsirpanis teo-tsirpanis mentioned this pull request Nov 22, 2024
Merged
@hskiba hskiba mentioned this pull request Nov 24, 2024
Draft
teo-tsirpanis added a commit to TileDB-Inc/TileDB that referenced this pull request Nov 26, 2024
@teo-tsirpanis
Use preinstalled pkg-config Homebrew recipe. (#5383)
9f0acfa 
[SC-59678](https://app.shortcut.com/tiledb-inc/story/59678/core-arrays-fix-ci-on-dev-branch)

GitHub Actions now
[bundles](actions/runner-images#10971)
`pkg-config` in macOS images. This PR stops installing it with `brew`,
which causes conflicts related to the recipe's deprecation and
replacement with `pkgconf`.

---
TYPE: NO_HISTORY
ihnorton pushed a commit to ihnorton/TileDB that referenced this pull request Dec 4, 2024
@teo-tsirpanis @ihnorton
Use preinstalled pkg-config Homebrew recipe. (TileDB-Inc#5383)
e5fb2cc 
[SC-59678](https://app.shortcut.com/tiledb-inc/story/59678/core-arrays-fix-ci-on-dev-branch)

GitHub Actions now
[bundles](actions/runner-images#10971)
`pkg-config` in macOS images. This PR stops installing it with `brew`,
which causes conflicts related to the recipe's deprecation and
replacement with `pkgconf`.

---
TYPE: NO_HISTORY
ihnorton pushed a commit to ihnorton/TileDB that referenced this pull request Dec 4, 2024
@teo-tsirpanis @ihnorton
Use preinstalled pkg-config Homebrew recipe. (TileDB-Inc#5383)
610d7f4 
[SC-59678](https://app.shortcut.com/tiledb-inc/story/59678/core-arrays-fix-ci-on-dev-branch)

GitHub Actions now
[bundles](actions/runner-images#10971)
`pkg-config` in macOS images. This PR stops installing it with `brew`,
which causes conflicts related to the recipe's deprecation and
replacement with `pkgconf`.

---
TYPE: NO_HISTORY

(cherry picked from commit 9f0acfa)
mikelle-rogers pushed a commit to mikelle-rogers/runtime that referenced this pull request Dec 10, 2024
@akoeplinger @mikelle-rogers
Temporarily uninstall [email protected] in install-dependencies.sh (d…
86f63e0 
…otnet#109968)

This was added by AzDO in actions/runner-images#10971 as a workaround for actions/runner-images#10984, but that means the old package now conflicts with the new pkg-config which is an alias to pkgconf.

Fixes the build issues we've seen with OSX image version 20241119.505
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erik-bershel erik-bershel erik-bershel approved these changes

@sureshe456 sureshe456 sureshe456 approved these changes

@paveliak paveliak Awaiting requested review from paveliak

Assignees

@sarathrajsrinivasan sarathrajsrinivasan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sarathrajsrinivasan @erik-bershel @sureshe456