Skip to content

Commit fc27ccc

Browse files
author
Meyn
committed
Fix new release format
1 parent e73d247 commit fc27ccc

File tree

8 files changed

+38
-116
lines changed

8 files changed

+38
-116
lines changed

.github/workflows/compilation.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ on:
5656
SPOTIFY_CLIENT_SECRET:
5757
required: false
5858
description: "Spotify API Client Secret"
59+
YOUTUBE_SECRET:
60+
required: false
61+
description: "YouTube API Secret"
5962
outputs:
6063
build_status:
6164
description: "Status of the build"
@@ -131,12 +134,14 @@ jobs:
131134
echo "Minimum Lidarr Version: ${{ inputs.minimum_lidarr_version }}"
132135
echo "Spotify Client ID is configured: ${{ secrets.SPOTIFY_CLIENT_ID != '' }}"
133136
echo "Spotify Client Secret is configured: ${{ secrets.SPOTIFY_CLIENT_SECRET != '' }}"
137+
echo "YouTube Secret is configured: ${{ secrets.YOUTUBE_SECRET != '' }}"
134138
135139
- name: Build with package version and metadata
136140
id: build_step
137141
env:
138142
SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
139143
SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
144+
YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
140145
run: |
141146
# Restore NuGet packages first
142147
dotnet restore *.sln
@@ -155,6 +160,7 @@ jobs:
155160
-p:MinimumLidarrVersion="${{ inputs.minimum_lidarr_version }}" \
156161
-p:SpotifyClientId=$SPOTIFY_CLIENT_ID \
157162
-p:SpotifyClientSecret=$SPOTIFY_CLIENT_SECRET \
163+
-p:YouTubrSecret=$YOUTUBE_SECRET \
158164
-p:CI="true" \
159165
-v:n
160166

.github/workflows/git-info.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ on:
3232
is_latestrelease:
3333
description: "Whether this should be the newest stable release"
3434
value: ${{ jobs.git_info.outputs.is_latestrelease }}
35+
plugin_input_format:
36+
description: "Plugin input format: name@owner#branch"
37+
value: ${{ jobs.git_info.outputs.plugin_input_format }}
3538

3639
jobs:
3740
branch_detection:
@@ -50,6 +53,7 @@ jobs:
5053
repo_owner: ${{ steps.extract_git_info.outputs.repo_owner }}
5154
commit_messages: ${{ steps.get_commit_messages.outputs.commit_messages }}
5255
is_latestrelease: ${{ steps.check_latest_release.outputs.is_latestrelease }}
56+
plugin_input_format: ${{ steps.extract_git_info.outputs.plugin_input_format }}
5357

5458
steps:
5559
- name: Checkout repository
@@ -103,6 +107,16 @@ jobs:
103107
REPO_OWNER=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f1)
104108
echo "repo_owner=$REPO_OWNER" >> $GITHUB_OUTPUT
105109
echo "Repository owner: $REPO_OWNER"
110+
111+
# Generate plugin input format: name@owner#branch (or name@owner if master)
112+
REPO_NAME=$(basename $GITHUB_REPOSITORY)
113+
if [ "$BRANCH_NAME" != "master" ]; then
114+
PLUGIN_INPUT="$REPO_NAME@$REPO_OWNER#$BRANCH_NAME"
115+
else
116+
PLUGIN_INPUT="$REPO_NAME@$REPO_OWNER"
117+
fi
118+
echo "plugin_input_format=$PLUGIN_INPUT" >> $GITHUB_OUTPUT
119+
echo "Plugin input format: $PLUGIN_INPUT"
106120
107121
- name: Check if Latest Release
108122
id: check_latest_release

.github/workflows/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
secrets:
6262
SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
6363
SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
64+
YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
6465
needs: [metadata, git-info, dotnet-setup]
6566

6667
# Package the artifacts
@@ -84,7 +85,8 @@ jobs:
8485
commit_messages: ${{ needs.git-info.outputs.commit_messages }}
8586
git_commit: ${{ needs.git-info.outputs.git_commit }}
8687
branch_repo_url: ${{ needs.git-info.outputs.branch_repo_url }}
87-
git_branch: ${{ needs.git-info.outputs.git_branch }}
88+
git_branch: ${{ needs.git-info.outputs.git_branch }}
89+
plugin_input_format: ${{ needs.git-info.outputs.plugin_input_format }}
8890
needs: [metadata, git-info]
8991

9092
# Publish the release
@@ -98,6 +100,7 @@ jobs:
98100
is_latestrelease: ${{ needs.git-info.outputs.is_latestrelease }}
99101
release_notes_id: ${{ needs.release-notes.outputs.release_notes_id }}
100102
git_commit: ${{ needs.git-info.outputs.git_commit }}
101-
branch_repo_url: ${{ needs.git-info.outputs.branch_repo_url }}
103+
branch_repo_url: ${{ needs.git-info.outputs.branch_repo_url }}
104+
git_branch: ${{ needs.git-info.outputs.git_branch }}
102105
needs: [metadata, git-info, compilation, packaging, release-notes]
103106
if: needs.compilation.outputs.build_status == 'success'

.github/workflows/metadata.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,21 +134,11 @@ jobs:
134134
- name: Determine build suffix
135135
id: build_info
136136
run: |
137-
# Get the branch name from branch detection workflow
138-
BRANCH_NAME="${{ needs.branch_detection.outputs.branch_name }}"
139-
echo "Using branch name from detection: $BRANCH_NAME"
140-
141137
# Get the framework from the extract_framework step
142138
FRAMEWORK="${{ steps.extract_framework.outputs.framework }}"
143139
144-
# Format the build suffix based on branch
145-
if [ "$BRANCH_NAME" = "master" ]; then
146-
# On master, use only the framework
147-
BUILD_SUFFIX="$FRAMEWORK"
148-
else
149-
# On other branches, use framework-branch format
150-
BUILD_SUFFIX="$FRAMEWORK-$BRANCH_NAME"
151-
fi
140+
# Build suffix is just the framework
141+
BUILD_SUFFIX="$FRAMEWORK"
152142
153143
echo "Framework: $FRAMEWORK"
154144
echo "Build suffix: $BUILD_SUFFIX"

.github/workflows/publishing.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ on:
3636
type: string
3737
description: "Repository URL with branch path"
3838
default: ""
39+
git_branch:
40+
required: true
41+
type: string
42+
description: "Git branch name for target_commitish"
3943
outputs:
4044
release_url:
4145
description: "URL of the created release"
@@ -96,6 +100,7 @@ jobs:
96100
body_path: ${{ steps.verify_artifacts.outputs.release_notes_path }}
97101
prerelease: ${{ inputs.is_prerelease == 'true' }}
98102
make_latest: ${{ inputs.is_latestrelease == 'true' }}
103+
target_commitish: ${{ inputs.git_branch }}
99104
files: |
100105
${{ steps.verify_artifacts.outputs.artifact_path }}
101106
fail_on_unmatched_files: true

.github/workflows/release-notes.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ on:
3535
required: true
3636
type: string
3737
description: "Current git branch"
38+
plugin_input_format:
39+
required: true
40+
type: string
41+
description: "Plugin input format: name@owner#branch"
3842
outputs:
3943
release_notes_id:
4044
description: "ID of the generated release notes"
@@ -84,7 +88,7 @@ jobs:
8488
8589
**Plugin Installation:**
8690
- In Lidarr, navigate to **System -> Plugins**
87-
- Paste the URL: \`${{ inputs.branch_repo_url }}\`
91+
- Enter: \`${{ inputs.plugin_input_format }}\`
8892
8993
---
9094
@@ -95,11 +99,6 @@ jobs:
9599
**Commit:** ${{ inputs.git_commit }}
96100
EOL
97101
98-
# Add extra line for branch detection if branch is not the default branch
99-
if [ ! -z "$BRANCH_NAME" ] && [ "$BRANCH_NAME" != "$DEFAULT_BRANCH" ]; then
100-
echo "Minimum Lidarr Version: 1000.${{ inputs.minimum_lidarr_version }} (This line is auto-generated for plugin parsing system - please disregard)" >> release_notes.md
101-
fi
102-
103102
# Debug: Show what was generated
104103
echo "Generated release notes:"
105104
cat release_notes.md

Tubifarry/Core/Utilities/FlexiblePluginService.cs

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)