fix: generate a `select` statement for each condition #1173

roya1v · 2024-07-16T19:42:07Z

This is should fix #1111 . I had the same issue where the select in cops would have multiple matching conditions, which I think isn't something wrong. So in here I changed the code so it generates separate selects for each option.

I'm not completely happy with the implementation and I still have to fix the tests probably, but please tell me if you think I'm going in a completely wrong direction

cgrindel · 2024-07-29T19:50:20Z

Instead of creating a separate to_multiple_starlark() function, can we integrate this logic into the existing to_starlark()?

roya1v · 2024-09-07T14:48:00Z

Hey @cgrindel ! Sorry for the long wait, I've combined the two functions like you suggested, let me know what you think

cgrindel

Overall, looks good. It appears that some unit tests need to be updated.

@luispadron Does this solution solve the original issue that you filed?

swiftpkg/internal/bzl_selects.bzl

luispadron

Thanks for working on this, sorry it's taken so long to review!

I'm out of office this week but I can double check if this solves our issue soon, if I forget please remind me!

It would also be nice to either figure out how to test this edge case in a fixture or to also build our current examples in release mode to see if that captures this case already.

swiftpkg/internal/bzl_selects.bzl

cgrindel · 2024-09-14T13:59:42Z

@Mergifyio queue

mergify · 2024-09-14T13:59:50Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at f5364a9

…#358) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [rules_swift_package_manager](https://redirect.github.com/cgrindel/rules_swift_package_manager) | http_archive | minor | `v0.37.0` -> `v0.38.2` | --- ### Release Notes <details> <summary>cgrindel/rules_swift_package_manager (rules_swift_package_manager)</summary> ### [`v0.38.2`](https://redirect.github.com/cgrindel/rules_swift_package_manager/releases/tag/v0.38.2) [Compare Source](https://redirect.github.com/cgrindel/rules_swift_package_manager/compare/v0.38.1...v0.38.2) #### What Has Changed #### What's Changed - chore: update README.md for v0.38.1 by [@cgrindel-app-token-generator](https://redirect.github.com/cgrindel-app-token-generator) in [cgrindel/rules_swift_package_manager#1242 **Full Changelog**: cgrindel/rules_swift_package_manager@v0.38.1...v0.38.2 #### Bazel Module Snippet ```python bazel_dep(name = "rules_swift_package_manager", version = "0.38.2") ``` ### [`v0.38.1`](https://redirect.github.com/cgrindel/rules_swift_package_manager/releases/tag/v0.38.1) [Compare Source](https://redirect.github.com/cgrindel/rules_swift_package_manager/compare/v0.38.0...v0.38.1) #### What Has Changed #### What's Changed - chore(deps): update dependency sdwebimage/sdwebimageswiftui to from: "3.1.2" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1213 **Full Changelog**: cgrindel/rules_swift_package_manager@v0.38.0...v0.38.1 #### Bazel Module Snippet ```python bazel_dep(name = "rules_swift_package_manager", version = "0.38.1") ``` ### [`v0.38.0`](https://redirect.github.com/cgrindel/rules_swift_package_manager/releases/tag/v0.38.0) [Compare Source](https://redirect.github.com/cgrindel/rules_swift_package_manager/compare/v0.37.0...v0.38.0) #### What Has Changed #### What's Changed - chore: update README.md for v0.37.0 by [@cgrindel-app-token-generator](https://redirect.github.com/cgrindel-app-token-generator) in [cgrindel/rules_swift_package_manager#1216 - chore(deps): update dependency gazelle to v0.38.0 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1193 - chore(deps): update dependency rules_apple to v3.8.0 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1196 - chore(deps): update dependency apple/swift-nio to v2.72.0 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1219 - fix: generate a `select` statement for each condition by [@roya1v](https://redirect.github.com/roya1v) in [cgrindel/rules_swift_package_manager#1173 - fix: ignore unresolved packages in Package.swift by [@luispadron](https://redirect.github.com/luispadron) in [cgrindel/rules_swift_package_manager#1223 - chore(deps): update dependency googlemaps/ios-maps-sdk to from: "9.1.0" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1208 - chore(deps): update dependency pointfreeco/swift-composable-architecture to from: "1.13.1" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1210 - chore(deps): update dependency nicklockwood/swiftformat to from: "0.54.4" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1218 - chore(deps): update dependency bazel to v7.3.1 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1207 - chore(deps): update dependency iterable/swift-sdk to from: "6.5.7" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1226 - chore(deps): update dependency googlemaps/ios-maps-sdk to from: "9.1.1" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1225 - chore(deps): update dependency nicklockwood/swiftformat to from: "0.54.5" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1227 - chore(deps): update dependency firebase/firebase-ios-sdk to from: "11.2.0" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1228 - chore(deps): update dependency googlecloudplatform/recaptcha-enterprise-mobile-sdk to from: "18.6.0" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1229 - chore(deps): update dependency pointfreeco/swift-composable-architecture to from: "1.15.0" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1230 - chore(deps): update dependency protobuf to v27.4 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1231 - chore(deps): update dependency vapor/vapor to v4.105.2 by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1235 - chore(deps): update dependency datatheorem/trustkit to from: "3.0.4" by [@cgrindel-self-hosted-renovate](https://redirect.github.com/cgrindel-self-hosted-renovate) in [cgrindel/rules_swift_package_manager#1148 - chore: remove legacy workspace info from release and readme by [@cgrindel](https://redirect.github.com/cgrindel) in [cgrindel/rules_swift_package_manager#1237 #### New Contributors - [@roya1v](https://redirect.github.com/roya1v) made their first contribution in [cgrindel/rules_swift_package_manager#1173 **Full Changelog**: cgrindel/rules_swift_package_manager@v0.37.0...v0.38.0 #### Bazel Module Snippet ```python bazel_dep(name = "rules_swift_package_manager", version = "0.38.0") ``` </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/bazel-contrib/rules_bazel_integration_test).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Very sloppy fix

f251a7f

roya1v changed the title ~~Possible Progress fix for #1111~~ Possible fix for #1111 Jul 16, 2024

roya1v added 3 commits September 7, 2024 16:27

Combine two functions into one

2ed8e0a

Fix argument

351074e

Fix plus sign

3ac1069

cgrindel changed the title ~~Possible fix for #1111~~ fix: generate a select statement for each condition Sep 7, 2024

cgrindel reviewed Sep 7, 2024

View reviewed changes

swiftpkg/internal/bzl_selects.bzl Outdated Show resolved Hide resolved

cgrindel marked this pull request as ready for review September 7, 2024 17:57

luispadron reviewed Sep 7, 2024

View reviewed changes

swiftpkg/internal/bzl_selects.bzl Outdated Show resolved Hide resolved

roya1v added 3 commits September 8, 2024 16:54

Wrap comment

07a6052

Extract common logic

5d0436e

Upate test

0e2357c

luispadron approved these changes Sep 8, 2024

View reviewed changes

cgrindel approved these changes Sep 14, 2024

View reviewed changes

Merge branch 'main' into multiple-conditional-copts

4a12d1e

mergify bot merged commit f5364a9 into cgrindel:main Sep 14, 2024
33 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: generate a `select` statement for each condition #1173

fix: generate a `select` statement for each condition #1173

roya1v commented Jul 16, 2024

cgrindel commented Jul 29, 2024

roya1v commented Sep 7, 2024

cgrindel left a comment

luispadron left a comment

cgrindel commented Sep 14, 2024

mergify bot commented Sep 14, 2024 •

edited

Loading

fix: generate a select statement for each condition #1173

fix: generate a select statement for each condition #1173

Conversation

roya1v commented Jul 16, 2024

cgrindel commented Jul 29, 2024

roya1v commented Sep 7, 2024

cgrindel left a comment

Choose a reason for hiding this comment

luispadron left a comment

Choose a reason for hiding this comment

cgrindel commented Sep 14, 2024

mergify bot commented Sep 14, 2024 • edited Loading

✅ The pull request has been merged automatically

fix: generate a `select` statement for each condition #1173

fix: generate a `select` statement for each condition #1173

mergify bot commented Sep 14, 2024 •

edited

Loading