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

Improve compatibility with Bazel 6. #499

Merged
merged 1 commit into from Apr 25, 2024
Merged

Improve compatibility with Bazel 6. #499

merged 1 commit into from Apr 25, 2024

Conversation

phst
Copy link
Contributor

@phst phst commented Apr 25, 2024

In Bazel 6, the doc parameter of the module_extension function doesn’t accept None; cf. https://bazel.build/versions/6.5.0/rules/lib/globals#module_extension vs. https://bazel.build/versions/7.0.0/rules/lib/globals/bzl#module_extension. Instead of passing None in that case, just don’t pass the argument at all and use the respective default.

In Bazel 6, the doc parameter of the module_extension function doesn’t accept
None; cf. https://bazel.build/versions/6.5.0/rules/lib/globals#module_extension
vs. https://bazel.build/versions/7.0.0/rules/lib/globals/bzl#module_extension.
Instead of passing None in that case, just don’t pass the argument at all and
use the respective default.
@fmeum
Copy link
Contributor

fmeum commented Apr 25, 2024

Cc @Wyverald

@Wyverald Wyverald merged commit 700c9ec into bazelbuild:main Apr 25, 2024
2 checks passed
cgrindel-self-hosted-renovate bot added a commit to cgrindel/bazel-starlib that referenced this pull request Apr 25, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| bazel_skylib | bazel_dep | patch | `1.6.0` -> `1.6.1` |
| [bazel_skylib](https://togithub.com/bazelbuild/bazel-skylib) |
http_archive | patch | `1.6.0` -> `1.6.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-skylib (bazel_skylib)</summary>

###
[`v1.6.1`](https://togithub.com/bazelbuild/bazel-skylib/releases/tag/1.6.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-skylib/compare/1.6.0...1.6.1)

Release 1.6.1

##### What's Changed

- Fix `modules` Bazel 6 compatibility by
[@&#8203;phst](https://togithub.com/phst) in
[bazelbuild/bazel-skylib#499

##### New Contributors

- [@&#8203;phst](https://togithub.com/phst) made their first
contribution in
[bazelbuild/bazel-skylib#499

**Full Changelog**:
bazelbuild/bazel-skylib@1.6.0...1.6.1

##### MODULE.bazel setup

```starlark
bazel_dep(name = "bazel_skylib", version = "1.6.1")

##### If the Gazelle plugin is needed:
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.6.1", dev_dependency = True)
```

##### WORKSPACE setup

```starlark
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "bazel_skylib",
    sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2"
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
```

***Additional WORKSPACE setup for the Gazelle plugin***

```starlark
http_archive(
    name = "bazel_skylib_gazelle_plugin",
    sha256 = "47337121076d4fc9c82079cde046431f7b1d2dd18df9c46b674522a9202d335e",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")

bazel_skylib_gazelle_plugin_workspace()

load("@&#8203;bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")

bazel_skylib_gazelle_plugin_setup()
```

**Using the rules**

See [the
source](https://togithub.com/bazelbuild/bazel-skylib/tree/1.6.1).

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
cgrindel-self-hosted-renovate bot added a commit to cgrindel/rules_swiftformat that referenced this pull request Apr 25, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [bazel_skylib](https://togithub.com/bazelbuild/bazel-skylib) |
http_archive | patch | `1.6.0` -> `1.6.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-skylib (bazel_skylib)</summary>

###
[`v1.6.1`](https://togithub.com/bazelbuild/bazel-skylib/releases/tag/1.6.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-skylib/compare/1.6.0...1.6.1)

Release 1.6.1

##### What's Changed

- Fix `modules` Bazel 6 compatibility by
[@&#8203;phst](https://togithub.com/phst) in
[bazelbuild/bazel-skylib#499

##### New Contributors

- [@&#8203;phst](https://togithub.com/phst) made their first
contribution in
[bazelbuild/bazel-skylib#499

**Full Changelog**:
bazelbuild/bazel-skylib@1.6.0...1.6.1

##### MODULE.bazel setup

```starlark
bazel_dep(name = "bazel_skylib", version = "1.6.1")

##### If the Gazelle plugin is needed:
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.6.1", dev_dependency = True)
```

##### WORKSPACE setup

```starlark
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "bazel_skylib",
    sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2"
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
```

***Additional WORKSPACE setup for the Gazelle plugin***

```starlark
http_archive(
    name = "bazel_skylib_gazelle_plugin",
    sha256 = "47337121076d4fc9c82079cde046431f7b1d2dd18df9c46b674522a9202d335e",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")

bazel_skylib_gazelle_plugin_workspace()

load("@&#8203;bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")

bazel_skylib_gazelle_plugin_setup()
```

**Using the rules**

See [the
source](https://togithub.com/bazelbuild/bazel-skylib/tree/1.6.1).

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
@phst phst deleted the ext branch April 25, 2024 22:02
cgrindel-self-hosted-renovate bot added a commit to cgrindel/rules_swift_package_manager that referenced this pull request Apr 26, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| bazel_skylib | bazel_dep | patch | `1.6.0` -> `1.6.1` |
| [bazel_skylib](https://togithub.com/bazelbuild/bazel-skylib) |
http_archive | patch | `1.6.0` -> `1.6.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-skylib (bazel_skylib)</summary>

###
[`v1.6.1`](https://togithub.com/bazelbuild/bazel-skylib/releases/tag/1.6.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-skylib/compare/1.6.0...1.6.1)

Release 1.6.1

#### What's Changed

- Fix `modules` Bazel 6 compatibility by
[@&#8203;phst](https://togithub.com/phst) in
[bazelbuild/bazel-skylib#499

#### New Contributors

- [@&#8203;phst](https://togithub.com/phst) made their first
contribution in
[bazelbuild/bazel-skylib#499

**Full Changelog**:
bazelbuild/bazel-skylib@1.6.0...1.6.1

#### MODULE.bazel setup

```starlark
bazel_dep(name = "bazel_skylib", version = "1.6.1")

### If the Gazelle plugin is needed:
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.6.1", dev_dependency = True)
```

#### WORKSPACE setup

```starlark
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "bazel_skylib",
    sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
```

***Additional WORKSPACE setup for the Gazelle plugin***

```starlark
http_archive(
    name = "bazel_skylib_gazelle_plugin",
    sha256 = "47337121076d4fc9c82079cde046431f7b1d2dd18df9c46b674522a9202d335e",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")

bazel_skylib_gazelle_plugin_workspace()

load("@&#8203;bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")

bazel_skylib_gazelle_plugin_setup()
```

**Using the rules**

See [the
source](https://togithub.com/bazelbuild/bazel-skylib/tree/1.6.1).

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
cgrindel-self-hosted-renovate bot added a commit to cgrindel/rules_swift_package_manager that referenced this pull request Apr 26, 2024
…1046)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| bazel_skylib_gazelle_plugin | bazel_dep | patch | `1.6.0` -> `1.6.1` |
|
[bazel_skylib_gazelle_plugin](https://togithub.com/bazelbuild/bazel-skylib)
| http_archive | patch | `1.6.0` -> `1.6.1` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-skylib (bazel_skylib_gazelle_plugin)</summary>

###
[`v1.6.1`](https://togithub.com/bazelbuild/bazel-skylib/releases/tag/1.6.1)

[Compare
Source](https://togithub.com/bazelbuild/bazel-skylib/compare/1.6.0...1.6.1)

Release 1.6.1

#### What's Changed

- Fix `modules` Bazel 6 compatibility by
[@&#8203;phst](https://togithub.com/phst) in
[bazelbuild/bazel-skylib#499

#### New Contributors

- [@&#8203;phst](https://togithub.com/phst) made their first
contribution in
[bazelbuild/bazel-skylib#499

**Full Changelog**:
bazelbuild/bazel-skylib@1.6.0...1.6.1

#### MODULE.bazel setup

```starlark
bazel_dep(name = "bazel_skylib", version = "1.6.1")

### If the Gazelle plugin is needed:
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.6.1", dev_dependency = True)
```

#### WORKSPACE setup

```starlark
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "bazel_skylib",
    sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
```

***Additional WORKSPACE setup for the Gazelle plugin***

```starlark
http_archive(
    name = "bazel_skylib_gazelle_plugin",
    sha256 = "47337121076d4fc9c82079cde046431f7b1d2dd18df9c46b674522a9202d335e",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-gazelle-plugin-1.6.1.tar.gz",
    ],
)

load("@&#8203;bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")

bazel_skylib_gazelle_plugin_workspace()

load("@&#8203;bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")

bazel_skylib_gazelle_plugin_setup()
```

**Using the rules**

See [the
source](https://togithub.com/bazelbuild/bazel-skylib/tree/1.6.1).

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
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.

None yet

3 participants