Skip to content

Commit

Permalink
try again lol (#17)
Browse files Browse the repository at this point in the history
* [Trivia] Correct Stephen to Steven (Cog-Creators#6434)

Co-authored-by: Artemis6969 <[email protected]>

* Generate default LL server config and attach it to GH release (Cog-Creators#6430)

* [Audio] Update Lavalink.jar and yt source build numbers (Cog-Creators#6435)

Co-authored-by: Jakub Kuczys <[email protected]>

* [Audio] Fix trying to send notify message with no channel object (Cog-Creators#6429)

* Bump dependencies (Cog-Creators#6436)

* Red 3.5.13 - Changelog (Cog-Creators#6437)

* Automated Crowdin downstream (Cog-Creators#6439)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Version bump to 3.5.13 (Cog-Creators#6438)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix publish release workflow

* Add missing perm to Publish Release workflow

* Change Red 3.5.13 release date

* Version bump to 3.5.14.dev1

* [Trivia] Correct typos in World Cup trivia list for Golden Glove questions (Cog-Creators#6441)

* Split out non-Python assets in Publish Release workflow (Cog-Creators#6440)

---------

Co-authored-by: Guyonsteroids <[email protected]>
Co-authored-by: Artemis6969 <[email protected]>
Co-authored-by: Jakub Kuczys <[email protected]>
Co-authored-by: aikaterna <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mellow <[email protected]>
  • Loading branch information
7 people authored Aug 28, 2024
1 parent ca96a2d commit 52740a9
Show file tree
Hide file tree
Showing 75 changed files with 1,062 additions and 362 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,43 @@ jobs:
name: build-output
path: ./dist

generate_default_ll_server_config:
name: Generate default application.yml
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Install script's dependencies
run: python -m pip install PyYAML

- name: Generate default application.yml
env:
APP_YML_FILE: "Red-DiscordBot-${{ github.ref_name }}-default-lavalink-application.yml"
run: |
mkdir -p release_assets
python .github/workflows/scripts/get_default_ll_server_config.py "release_assets/$APP_YML_FILE"
- name: Upload default application.yml
uses: actions/upload-artifact@v3
with:
name: ll-default-server-config
path: ./release_assets

release_to_pypi:
needs:
- release_information
- build
- generate_default_ll_server_config
environment: Release
name: Release to PyPI
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
steps:
- name: Download packaged distributions
Expand All @@ -96,6 +125,18 @@ jobs:
name: build-output
path: dist/

- name: Download default application.yml
uses: actions/download-artifact@v3
with:
name: ll-default-server-config
path: release_assets/

- name: Upload dists to GitHub Release
env:
GITHUB_TOKEN: "${{ github.token }}"
run: |
gh release upload "$GITHUB_REF_NAME" dist/* release_assets/* --repo "$GITHUB_REPOSITORY"
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/scripts/get_default_ll_server_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import sys
from pathlib import Path

import yaml

ROOT_FOLDER = Path(__file__).parents[3].absolute()
AUDIO_FOLDER = ROOT_FOLDER / "redbot/cogs/audio"

# We want to import `redbot.cogs.audio.managed_node` package as if it were top-level package
# so we have to the `redbot/cogs/audio` directory to Python's path.
sys.path.insert(0, str(AUDIO_FOLDER))


def main() -> int:
try:
output_file = sys.argv[1]
except IndexError:
print("Usage:", sys.argv[0], "<output_file>", file=sys.stderr)
return 2

import managed_node

server_config = managed_node.get_default_server_config()
with open(output_file, "w", encoding="utf-8") as fp:
yaml.safe_dump(server_config, fp)

return 0


if __name__ == "__main__":
raise SystemExit(main())
33 changes: 33 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
.. Red changelogs
Redbot 3.5.13 (2024-08-27)
==========================

| Thanks to all these amazing people that contributed to this release:
| :ghuser:`aikaterna`, :ghuser:`Guyonsteroids`, :ghuser:`Jackenmen`, :ghuser:`Kowlin`
Read before updating
--------------------

#. Information for Audio users that are using an external Lavalink instance (if you don't know what that is, you should skip this point):

We've updated our default application.yml file and you should update your instance's ``application.yml`` accordingly.
More specifically, we bumped the version of YT source plugin.
`Download Red 3.5.13's default application.yml file <https://github.com/Cog-Creators/Red-DiscordBot/releases/download/3.5.13/Red-DiscordBot-3.5.13-default-lavalink-application.yml>`__

End-user changelog
------------------

Changes
*******

- **Core - Dependencies** - Red's dependencies have been bumped (:issue:`6436`)

Fixes
*****

- **Cogs - Audio** - Updated Audio to support planned changes to Discord API scheduled for November (:issue:`6435`)
- **Cogs - Audio** - Fixed YT live stream detection (:issue:`6435`)
- **Cogs - Audio** - Fixed Red erroneously trying to send a message to a notification channel when one is not set (:issue:`6429`)
- **Cogs - Trivia - Lists** - Fixed spelling of Steven Spielberg's first name in the ``entertainment`` trivia list (:issue:`6434`)

----

Redbot 3.5.12 (2024-08-08)
==========================

Expand Down
2 changes: 1 addition & 1 deletion redbot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def _early_init():


# This is bumped automatically by release workflow (`.github/workflows/scripts/bump_version.py`)
_VERSION = "3.5.13.dev1"
_VERSION = "3.5.14.dev1"

__version__, version_info = VersionInfo._get_version()

Expand Down
25 changes: 24 additions & 1 deletion redbot/cogs/audio/core/commands/locales/pt-BR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions redbot/cogs/audio/core/events/cog.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ async def on_red_audio_track_auto_play(
if not guild:
return
notify_channel = guild.get_channel_or_thread(player.fetch("notify_channel"))
if not notify_channel:
return
has_perms = self._has_notify_perms(notify_channel)
tries = 0
while not player._is_playing:
Expand Down
4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/ar-SA.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/bg-BG.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/cs-CZ.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/da-DK.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/de-DE.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/es-ES.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/fi-FI.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/fr-FR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/hi-IN.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/hr-HR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/hu-HU.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions redbot/cogs/audio/core/events/locales/id-ID.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 52740a9

Please sign in to comment.