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

Remove llvm.org as deno dependency on darwin+x86-64 #5765

Merged
merged 7 commits into from
Apr 3, 2024
Merged

Remove llvm.org as deno dependency on darwin+x86-64 #5765

merged 7 commits into from
Apr 3, 2024

Conversation

felipecrs
Copy link
Contributor

@felipecrs felipecrs commented Apr 1, 2024

Continues #5751

@jhheider
Copy link
Contributor

jhheider commented Apr 1, 2024

rebuilding 1.42.1 to hopefully allow this to pass.

@jhheider
Copy link
Contributor

jhheider commented Apr 1, 2024

once this is live, i'll rebuild the deno versions since the libunwind change.

@felipecrs
Copy link
Contributor Author

felipecrs commented Apr 1, 2024

@jhheider this will probably do the trick. If it passes CI, here's my recommendation:

  1. Merge this
  2. Rebuild deno 1.42.1
  3. Revert 8e3d31f
  4. Rebuild all recent deno versions since the libunwind change.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
@felipecrs
Copy link
Contributor Author

I wonder if I should remove the otool test by the way. It does not seem to be proving anything anymore.

@felipecrs
Copy link
Contributor Author

felipecrs commented Apr 1, 2024

I also wonder if I should remove llvm.org as build dependency on darwin+x86-64 now, lol. But I guess tests will let us know.

Probably yes.

@jhheider
Copy link
Contributor

jhheider commented Apr 1, 2024

if we can, we should.

@felipecrs
Copy link
Contributor Author

I wonder if I should remove the otool test by the way. It does not seem to be proving anything anymore.

Removed the tests. The good news is that the current tests are enough to test the libunwind issue:

https://github.com/pkgxdev/pantry/actions/runs/8513890027/job/23318505536?pr=5765#step:9:119

@felipecrs felipecrs marked this pull request as ready for review April 1, 2024 22:56
@felipecrs felipecrs requested a review from jhheider April 1, 2024 22:56
Comment on lines +23 to +32
# deno does not need llvm to build on darwin+x86-64, and if it is present,
# deno will be linked to its libunwind, which then causes deno to need llvm
# in runtime.
- |
if test "{{hw.platform}}+{{ hw.arch }}" != "darwin+x86-64"; then
set -o allexport
source <(pkgx +llvm.org^17)
set +o allexport
fi

Copy link
Contributor

Choose a reason for hiding this comment

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

so, shouldn't this be a build depedency?

build:
  dependency:
    linux:
      llvm.org: ^17
    darwin/aarch64:
      llvm.org: ^17

?

Copy link
Contributor Author

@felipecrs felipecrs Apr 1, 2024

Choose a reason for hiding this comment

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

For some weird reason it doesn't work:

For some reason when adding rust later, llvm also needs to be added later.

Originally posted by @felipecrs in #5751 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But let's try once again: bcd5ec3

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@felipecrs felipecrs requested a review from jhheider April 1, 2024 23:36
@felipecrs
Copy link
Contributor Author

@jhheider sorry to ask but is there anything pending for this to be executed? I'm asking because I'm waiting for it before converting one of my projects to use pkgx to install deno.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

sorry, been tied up in other tasks. is the order of operations:

  • merge
  • rebuild deno~1.39
  • revert ci.yml changes
  • (rebuild again?)
  • rebuild all deno versions built since libunwind was added

@felipecrs
Copy link
Contributor Author

I think the current version of deno being used by brewkit actions is deno 1.42.1 (#5765 (comment)), so:

  1. merge
  2. rebuild [email protected]
  3. revert 8e3d31f
  4. rebuild all deno versions built since libunwind was added

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

probably need to build ~1.39 as used by pkgx.sh as well; no worries, that's easy.

well, let's roll the dice. no time like the present to try and break it to fix it! :)

@jhheider jhheider merged commit 00da271 into pkgxdev:main Apr 3, 2024
5 checks passed
@felipecrs felipecrs deleted the remove-llvm-deno-darwin-x86-64 branch April 3, 2024 19:18
@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

https://github.com/pkgxdev/pantry/actions/runs/8544318017/job/23410096465

what we need to do is force it to use an old deno version for the internal usage until we can rebuild.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

reverting.

jhheider added a commit that referenced this pull request Apr 3, 2024
@felipecrs
Copy link
Contributor Author

https://github.com/pkgxdev/pantry/actions/runs/8544318017/job/23410096465

This does not seem to be using 8e3d31f for some reason:

image

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

yeah... missed pkg-platform.yml; i'll revert the reversion with that change.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

6e3c966

@felipecrs
Copy link
Contributor Author

Ops, I guess I forgot it. My bad.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

no apologies necessary. it's a complex bit of revlock, and your hard work is completely appreciated.

@felipecrs
Copy link
Contributor Author

felipecrs commented Apr 3, 2024

By the way it's probably not necessary to rebuild ~1.39 at first, as I believe pkgx is always used from the precompiled binaries anyway.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

well, i think we've got it. 1.42.1 built, rolled out the brewkit diversions, and it built again. building 1.42.0 with it, then i'll trigger all the other rebuilds to go while we all sleep.

@jhheider
Copy link
Contributor

jhheider commented Apr 3, 2024

Screenshot 2024-04-03 at 19 15 40 and once this is done, we should be set here.

thanks for all this work, @felipecrs . software's anything but trivial.

@felipecrs
Copy link
Contributor Author

Awesome!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants