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

feat(playout): add Liquidsoap 2.0 support #2786

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

mp3butcher
Copy link
Contributor

@mp3butcher mp3butcher commented Nov 26, 2023

Description

add Liquidsoap2.0 files
(port syntax 1.4 to 2.0)

Testing Notes

I ran libretime on ubuntu 22.04 and liquidsoap2.0

this pr is just the beginning, just 2 files added it's a clean one...
in order to work under 22.04,it requires changes in

  1. this pr
  2. (feat(legacy): update deprecated PHP code #2789)
  3. libretime/propel (port PHP functions prototypes to PHP 8.x compliant syntax propel1#1) or change legacy /composer.json
-       "url": "https://github.com/libretime/propel1"
+       "url": "https://github.com/mp3butcher/propel1"
     },
     {
       "type": "vcs",
 @@ -30,7 +30,7 @@
     "james-heinrich/getid3": "^1.9",
     "league/uri": "^6.7",
     "libretime/celery-php": "dev-main",
-     "libretime/propel1": "dev-main",
+    "mp3butcher/propel1": "main",
     "php-amqplib/php-amqplib": "^3.0",
  1. and few mods in install
    ubuntu-20.04) is_ubuntu=true && distro="focal" ;;
+    ubuntu-22.04) is_ubuntu=true && distro="jammy" ;;
    debian-11)    is_debian=true && distro="bullseye" ;;
    *)
      error "could not determine supported distribution '$ID-$VERSION_ID'
@@ -375,8 +376,12 @@ prepare_packages_install() {

  if $is_ubuntu; then
    install_packages software-properties-common
-    add-apt-repository -y ppa:libretime/libretime

+   +if echo $distro | grep -q 'focal'; then 
+      add-apt-repository -y ppa:libretime/libretime       
+   fi
+   if echo $distro | grep -q 'jammy'; then 
+      apt-get install php-cli php-dev  php  php-fpm php-pear php-yaml php-gd php-bcmath php-curl 
+   fi
    DEBIAN_FRONTEND=noninteractive apt-get -q update
  fi
}

It will require testing changes against ubuntu 20.4 and debian,that's why i think a testing branch can be wise

Copy link

codecov bot commented Nov 27, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6b4149d) 70.16% compared to head (68d818a) 70.11%.
Report is 94 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2786      +/-   ##
==========================================
- Coverage   70.16%   70.11%   -0.06%     
==========================================
  Files         147      147              
  Lines        3999     3992       -7     
==========================================
- Hits         2806     2799       -7     
  Misses       1193     1193              
Flag Coverage Δ
playout 47.40% <ø> (-0.28%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@paddatrapper paddatrapper changed the title add Liquidsoap2.0 support feat(playout): add Liquidsoap 2.0 support Nov 27, 2023
@mp3butcher mp3butcher changed the title feat(playout): add Liquidsoap 2.0 support feat(playout): add Liquidsoap 2.0 support + update deprecated PHP Nov 27, 2023
@paddatrapper
Copy link
Contributor

Thanks for your work and I hope to have a look through it later today! Please keep the 2 features (PHP updates and Liquidsoap) in separate PRs - this helps with review and understanding changes later on, generating changelogs, etc. If you wish to test both sets of changes combined, you can have your second branch be branched off the first and note that the first PR needs to be merged first.

@jooola jooola self-requested a review November 28, 2023 12:07
@mp3butcher mp3butcher changed the title feat(playout): add Liquidsoap 2.0 support + update deprecated PHP feat(playout): add Liquidsoap 2.0 support Nov 28, 2023
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