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

Do dependency resolution after checking valid configs #2960

Merged
merged 3 commits into from
Sep 24, 2024

Conversation

grillo-delmal
Copy link
Contributor

This is my attempt to fix #2695

This PR changes the dependency resolver algorithm so that it marks which resulting config is going to be used after all the incompatible configs have been discarded.

Copy link

github-actions bot commented Aug 18, 2024

✅ PR OK, no changes in deprecations or warnings

Total deprecations: 8

Total warnings: 0

Build statistics:

 statistics (-before, +after)
 executable size=5297464 bin/dub
 rough build time=62s
Full build output
DUB version 1.38.0, built on Jul  4 2024
LDC - the LLVM D compiler (1.39.0):
  based on DMD v2.109.1 and LLVM 18.1.6
  built with LDC - the LLVM D compiler (1.39.0)
  Default target: x86_64-unknown-linux-gnu
  Host CPU: znver3
  http://dlang.org - http://wiki.dlang.org/LDC


  Registered Targets:
    aarch64     - AArch64 (little endian)
    aarch64_32  - AArch64 (little endian ILP32)
    aarch64_be  - AArch64 (big endian)
    amdgcn      - AMD GCN GPUs
    arm         - ARM
    arm64       - ARM64 (little endian)
    arm64_32    - ARM64 (little endian ILP32)
    armeb       - ARM (big endian)
    avr         - Atmel AVR Microcontroller
    bpf         - BPF (host endian)
    bpfeb       - BPF (big endian)
    bpfel       - BPF (little endian)
    hexagon     - Hexagon
    lanai       - Lanai
    loongarch32 - 32-bit LoongArch
    loongarch64 - 64-bit LoongArch
    mips        - MIPS (32-bit big endian)
    mips64      - MIPS (64-bit big endian)
    mips64el    - MIPS (64-bit little endian)
    mipsel      - MIPS (32-bit little endian)
    msp430      - MSP430 [experimental]
    nvptx       - NVIDIA PTX 32-bit
    nvptx64     - NVIDIA PTX 64-bit
    ppc32       - PowerPC 32
    ppc32le     - PowerPC 32 LE
    ppc64       - PowerPC 64
    ppc64le     - PowerPC 64 LE
    r600        - AMD GPUs HD2XXX-HD6XXX
    riscv32     - 32-bit RISC-V
    riscv64     - 64-bit RISC-V
    sparc       - Sparc
    sparcel     - Sparc LE
    sparcv9     - Sparc V9
    spirv       - SPIR-V Logical
    spirv32     - SPIR-V 32-bit
    spirv64     - SPIR-V 64-bit
    systemz     - SystemZ
    thumb       - Thumb
    thumbeb     - Thumb (big endian)
    ve          - VE
    wasm32      - WebAssembly 32-bit
    wasm64      - WebAssembly 64-bit
    x86         - 32-bit X86: Pentium-Pro and above
    x86-64      - 64-bit X86: EM64T and AMD64
    xcore       - XCore
   Upgrading project in /home/runner/work/dub/dub/
    Starting Performing "release" build using /opt/hostedtoolcache/dc/ldc2-1.39.0/x64/ldc2-1.39.0-linux-x86_64/bin/ldc2 for x86_64.
    Building dub 1.39.0-beta.1+commit.15.g9e080385: building configuration [application]
source/dub/internal/dyaml/composer.d(210,43): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/composer.d(232,43): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/composer.d(336,43): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/event.d(196,5): Deprecation: cannot access overlapped field `Event.explicitDocument` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/event.d(214,5): Deprecation: cannot access overlapped field `Event.explicitDocument` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/event.d(241,5): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/event.d(148,5): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
source/dub/internal/dyaml/event.d(148,5): Deprecation: cannot access overlapped field `Event.implicit` with unsafe bit patterns in `@safe` code
     Linking dub
STAT:statistics (-before, +after)
STAT:executable size=5297464 bin/dub
STAT:rough build time=62s

@Geod24
Copy link
Member

Geod24 commented Sep 22, 2024

Could you use the new testing framework ? If you need some help setting it up let me know. I can also try to write a test myself but I won't be able to get to it until end of next week.

@grillo-delmal
Copy link
Contributor Author

grillo-delmal commented Sep 23, 2024

Could you use the new testing framework ? If you need some help setting it up let me know. I can also try to write a test myself but I won't be able to get to it until end of next week.

Sure, happy to help ^^ I'm just kinda out of the loop, so IDK what the new testing framework is 😅

Looking in the latest commits I'm assuming that it means to add it as a unit test on the source/dub/test folder?

I made a branch with that workflow here master...grillo-delmal:dub:unittest_issue_2695 by adding a couple of unittest to the dependencies.d file

Tell me if I got it right or if it needs some changes (like using a new file or something) and we can continue from there ;).

@Geod24
Copy link
Member

Geod24 commented Sep 23, 2024

Looking in the latest commits I'm assuming that it means to add it as a unit test on the source/dub/test folder?

Correct.

I made a branch with that workflow here master...grillo-delmal:dub:unittest_issue_2695 by adding a couple of unittest to the dependencies.d file

That looks good! In both cases, you might want to enforce that the right dependency is selected (0.0.0 over 0.0.1 IIUC?).

Tell me if I got it right or if it needs some changes (like using a new file or something) and we can continue from there ;).

I try to group the tests by category but it's a bit arbitrary and categories will likely evolve with time. Anything related to dependency resolution was added to dependencies.d so far so that's the exact place I would have put it.

@grillo-delmal
Copy link
Contributor Author

Ok, updated the tests and rebased the PR over it ^^.

Copy link
Member

@Geod24 Geod24 left a comment

Choose a reason for hiding this comment

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

Thanks!

@Geod24 Geod24 enabled auto-merge (rebase) September 24, 2024 10:44
@Geod24 Geod24 merged commit 0ca04db into dlang:master Sep 24, 2024
31 checks passed
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.

nonsensical unresolvable dependencies message
2 participants