From babb7d88fd6661a6cede9329a687b2356cc1afce Mon Sep 17 00:00:00 2001 From: maskedwolff Date: Thu, 17 Apr 2025 03:25:18 -0400 Subject: [PATCH] Update .github/workflows/merge-fancode-playlist.yml --- .github/workflows/merge-fancode-playlist.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/merge-fancode-playlist.yml b/.github/workflows/merge-fancode-playlist.yml index 2d37eca..b37ad97 100644 --- a/.github/workflows/merge-fancode-playlist.yml +++ b/.github/workflows/merge-fancode-playlist.yml @@ -10,7 +10,7 @@ on: jobs: merge: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # Change to a specific version to avoid "waiting" issues steps: - name: Checkout My Repo @@ -26,19 +26,4 @@ jobs: cat fancode_playlist.m3u >> merged_playlist.m3u echo "" >> merged_playlist.m3u echo "# --- Your Playlist: MaskedWolff/maskedwolf ---" >> merged_playlist.m3u - cat my_playlist.m3u >> merged_playlist.m3u - - - name: Commit and Push Merged Playlist - run: | - git config --global user.name "GitHub Actions" - git config --global user.email "github-actions@users.noreply.github.com" - - # Pull the latest changes from the remote repository - git pull origin main --rebase || echo "No rebase needed" - - # Add the merged playlist file - git add merged_playlist.m3u - - # Commit the changes if there are updates - if git diff --cached --quiet; then - echo " + cat my_playlist.m3u_