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

macOS: clean up macports and homebrew #50

Merged
merged 3 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
matrix:
container:
# Ubuntu group
- desc: 'Ubuntu 20.04 LTS (Focal Fossa)'
image: 'ubuntu:20.04'
ansibleopts: '--limit localhost'
- desc: 'Ubuntu 22.04 LTS (Jammy Jellyfish)'
image: 'ubuntu:22.04'
ansibleopts: '--limit localhost'
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/build-mythtv-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ jobs:
matrix:
container:
# Ubuntu group
- desc: 'Ubuntu 20.04 LTS (Focal Fossa)'
image: 'ubuntu:20.04'
ansibleopts: '--limit localhost'
configureopts: ''
- desc: 'Ubuntu 22.04 LTS (Jammy Jellyfish)'
image: 'ubuntu:22.04'
ansibleopts: '--limit localhost'
Expand Down Expand Up @@ -151,7 +147,7 @@ jobs:
path: mythtv

- name: Checkout ccache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.container.image }}-build-core-ccache-${{ github.sha }}
Expand Down
22 changes: 6 additions & 16 deletions roles/mythtv-homebrew/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

- name: specify a mariadb/mysql version to install
set_fact:
database_version=mysql@8.0
database_version=mysql
when:
database_version is undefined

Expand All @@ -31,7 +31,7 @@
- nasm
- autoconf
- automake
- pkgconfig
- pkg-config
- cmake
- gpatch
- ninja
Expand Down Expand Up @@ -83,7 +83,6 @@
- vulkan-tools
- vulkan-loader
- molten-vk
- audiofile
- libdiscid

- name: develop a Python package version suffix
Expand All @@ -98,21 +97,15 @@
- 'python@{{ python_exe_suffix }}'
- virtualenv
- pyenv-virtualenv
- python-lxml
- python-oauthlib
- python-dateutil
- python-requests
- python-urllib3
- python-configargparse
- python-markdown
- python-cryptography

- name: add perl essentials
set_fact:
homebrew_pkg_list:
- '{{ homebrew_pkg_list }}'
- perl
- cpanminus
- libdbi
- libiodbc

- name: utility packages from homebrew
set_fact:
Expand Down Expand Up @@ -184,20 +177,19 @@
- bs4
- common
- configparser
- cryptography
- datetime
- discid
- et
- features
- future
- HTMLParser
- httplib2
- importlib_metadata
- lxml
- markdown
- musicbrainzngs
- mysqlclient
- oauthlib
- port
- put
- py2app
- pycurl
- python_dateutil
Expand All @@ -206,7 +198,6 @@
- simplejson
- traceback2
- urllib3
- virtualenv
- wheel
environment:
MYSQLCLIENT_LDFLAGS: "{{ MYSQLCLIENT_LDFLAGS }}"
Expand All @@ -228,7 +219,6 @@
--force
Date::Manip
DateTime::Format::ISO8601
DBI
Image::Size
IO::Socket::INET6
JSON
Expand Down
57 changes: 27 additions & 30 deletions roles/mythtv-macports/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,36 +185,33 @@
virtualenv: ~/.mythtv/python-virtualenv
virtualenv_python: python{{ python_exe_suffix }}
name:
- 'argparse'
- 'audiofile'
- 'bs4'
- 'common'
- 'configparser'
- 'datetime'
- 'discid'
- 'et'
- 'features'
- 'future'
- 'HTMLParser'
- 'httplib2'
- 'importlib_metadata'
- 'lxml'
- 'markdown'
- 'musicbrainzngs'
- 'mysqlclient'
- 'oauthlib'
- 'port'
- 'put'
- 'py2app'
- 'pycurl'
- 'python_dateutil'
- 'requests'
- 'requests_cache==0.5.2'
- 'simplejson'
- 'traceback2'
- 'urllib3'
- 'virtualenv'
- 'wheel'
- argparse
- audiofile
- bs4
- common
- configparser
- cryptography
- datetime
- discid
- et
- features
- future
- HTMLParser
- httplib2
- importlib_metadata
- lxml
- musicbrainzngs
- mysqlclient
- oauthlib
- py2app
- pycurl
- python_dateutil
- requests
- requests_cache==0.5.2
- simplejson
- traceback2
- urllib3
- wheel
environment:
MYSQLCLIENT_LDFLAGS: "{{ MYSQLCLIENT_LDFLAGS }}"
MYSQLCLIENT_CFLAGS: "{{ MYSQLCLIENT_CFLAGS }}"
Expand Down
Loading