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.

Sign up for GitHub

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

Build: Upload for focal #3113

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Build: Upload for focal #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions .github/workflows/publish-deb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,20 @@ jobs:
strategy:
fail-fast: false
matrix:
os-ver: ["ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:23.04", "ubuntu:23.10", "debian:stable", "debian:testing", "debian:unstable"]
arch: ["linux/amd64", "linux/arm/v7", "linux/arm64/v8"]
os-ver:
- "ubuntu:18.04"
- "ubuntu:20.04"
- "ubuntu:22.04"
- "ubuntu:23.04"
- "ubuntu:23.10"
- "ubuntu:24.04"
- "debian:stable"
- "debian:testing"
- "debian:unstable"
arch:
- "linux/amd64"
- "linux/arm/v7"
- "linux/arm64/v8"

isPR:
- ${{github.event_name == 'pull_request'}}
Expand Down Expand Up @@ -48,18 +60,17 @@ jobs:
DEB_UPLOAD_SECRET_ACCESS_KEY: ${{ secrets.DEB_UPLOAD_SECRET_ACCESS_KEY }}
PKG_SIGNING_KEY: ${{ secrets.PKG_SIGNING_KEY }}
PKG_SIGNING_KEY_ID: ${{ secrets.PKG_SIGNING_KEY_ID }}
GH_EVENT: ${{ github.event_name }}
run: |
docker run \
--platform=${{ matrix.arch }} \
-e TZ=Etc/UTC \
-e DEB_UPLOAD_ACCESS_KEY_ID \
-e DEB_UPLOAD_ENDPOINT \
-e DEB_UPLOAD_SECRET_ACCESS_KEY \
-e PKG_SIGNING_KEY \
-e PKG_SIGNING_KEY_ID \
-e DEB_UPLOAD_ENDPOINT \
-e GH_ACTIONS=y \
-e GH_EVENT \
-e GH_EVENT="${{ github.event_name }}" \
-v "$(pwd):/build" \
-w /build \
${{ matrix.os-ver }} \
Expand Down
12 changes: 11 additions & 1 deletion ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@

### HEAD

- Add missing define on ubuntu 18
- Add sample-frequency to config2.xsd
- Adding consistent album artist support
- Build support for libnpupnp 6.1.2
- Build: Add install scripts for OpenSuSE
- Build: Add install scripts for alpine/docker
- Build: Add install scripts for OpenSuSE
- Build: Allow build of ffmpegthumbnailer without ffmpeg
- Build: rework dependency handling
- Build: Scripts fail again with build
- Build: split debian modules
- Build: Upload for bionic
- Build: Upload for focal
- Build: Use Ruby2.6 for bionic
- Build: Use Ruby2.7 for bionic
- CI: Drop excluded ubuntu versions as CMake PPA now supports those combinations
- CI: Pass publish-deb secrets via env instead
- CI: Upload debs to pkg.gerbera.io
- clang-tidy: don't cast through void
- config2.xsd fixes
- Config: Add flag to disable dynamic descriptions
- docs: Update Arch Linux installs
- Docs: Update Ubuntu/Debian repo instructions
Expand All @@ -21,6 +30,7 @@
- Handle broken Systemd on some debian
- Import: Add option case sensitive tags
- Import: fix single file update
- Inotify: Handle Inotify access failed
- Insecure download due to ubuntu-20.04/armhf failing
- Libexif: add custom logger
- Logging: Separate description requests
Expand Down
27 changes: 15 additions & 12 deletions scripts/debian/build-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ fi

function install-gcc() {
echo "::group::Installing GCC"
# bionic defaults to gcc-7
sudo apt-get install g++ -y
echo "::endgroup::"
}
Expand All @@ -45,11 +44,11 @@ function install-cmake() {
}

function set-libraries-dist() {
echo "No ${lsb_distro} libs"
echo "No ${lsb_distro} Libraries"
}

function set-libraries-rel() {
echo "No ${lsb_codename} libs"
echo "No ${lsb_codename} Libraries"
}

function set-libraries() {
Expand Down Expand Up @@ -87,6 +86,8 @@ function upload_to_repo() {
echo "::endgroup::"
}

echo "::group::Preparing Libraries"

# Fix time issues
if [[ ! -f /etc/timezone ]]; then
ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
Expand All @@ -98,7 +99,7 @@ apt-get update -y
apt-get install -y lsb-release sudo wget curl git ca-certificates

# Work around https://github.com/actions/checkout/issues/760
GH_ACTIONS="${GH_ACTIONS-n}"
GH_ACTIONS="${GH_ACTIONS:-n}"
if [[ "${GH_ACTIONS}" == "y" ]]; then
git config --global --add safe.directory "$(pwd)"
fi
Expand Down Expand Up @@ -135,19 +136,21 @@ set-libraries
set-libraries-dist
set-libraries-rel

echo "Selecting $libduktape for $lsb_distro $lsb_codename"
echo "Selecting ${libduktape} for ${lsb_distro} ${lsb_codename}"

if [[ "${my_sys}" == "HEAD" ]]; then
libexif=""
libexiv2=""
libduktape=""
libpugixml=""
ffmpegthumbnailer=""
if [[ "$lsb_codename" != "jammy" ]]; then
if [[ "${lsb_codename}" != "jammy" ]]; then
libmatroska=""
fi
fi

echo "::endgroup::"

if [[ ! -d build-deb ]]; then
mkdir build-deb

Expand Down Expand Up @@ -175,13 +178,13 @@ if [[ ! -d build-deb ]]; then
libsqlite3-dev \
uuid-dev
sudo apt-get clean
echo "::endgroup::"

if [[ "$lsb_codename" == "bionic" ]]; then
if [[ "${lsb_codename}" == "bionic" ]]; then
# dpkg-dev pulls g++ which changes your GCC symlinks because ubuntu knows better than you
sudo update-alternatives --set gcc /usr/bin/gcc-8
sudo update-alternatives --set cpp /usr/bin/cpp-8
fi
echo "::endgroup::"

if [[ "${my_sys}" == "HEAD" ]]; then
install-googletest
Expand All @@ -190,7 +193,7 @@ if [[ ! -d build-deb ]]; then
install-pugixml
install-duktape
install-ffmpegthumbnailer
if [[ "$lsb_codename" != "jammy" ]]; then
if [[ "${lsb_codename}" != "jammy" ]]; then
install-matroska
fi
fi
Expand All @@ -214,7 +217,7 @@ git_ver=$(git describe --tags | sed 's/\(.*\)-.*/\1/' | sed s/-/+/ | sed s/v//)
# If version contains a + this is a non-tag build so add commit date
deb_version="${git_ver}-${lsb_codename}1"
is_tag=1
if [[ $git_ver == *"+"* ]]; then
if [[ ${git_ver} == *"+"* ]]; then
deb_version="${git_ver}~${commit_date}-${lsb_codename}1"
is_tag=0
fi
Expand Down Expand Up @@ -250,8 +253,8 @@ if [[ (! -f ${deb_name}) || "${my_sys}" == "HEAD" ]]; then
if [[ "${lsb_distro}" != "Raspbian" ]]; then
if [[ "${my_sys}" != "HEAD" ]]; then
cpack -G DEB \
-D CPACK_DEBIAN_PACKAGE_VERSION="$deb_version" \
-D CPACK_DEBIAN_PACKAGE_ARCHITECTURE="$deb_arch"
-D CPACK_DEBIAN_PACKAGE_VERSION="${deb_version}" \
-D CPACK_DEBIAN_PACKAGE_ARCHITECTURE="${deb_arch}"
fi
fi
echo "::endgroup::"
Expand Down
4 changes: 3 additions & 1 deletion scripts/debian/include-bionic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ function install-gcc() {
function install-cmake() {
echo "::group::Installing CMake"
sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget -y
curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
curl https://apt.kitware.com/keys/kitware-archive-latest.asc \
| gpg --dearmor - \
| sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${lsb_codename} main"
sudo apt-get update -y
sudo apt-get install cmake -y
Expand Down
4 changes: 2 additions & 2 deletions scripts/debian/include-buster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function install-cmake() {
echo "::group::Installing CMake"
sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget -y
curl https://apt.kitware.com/keys/kitware-archive-latest.asc \
| gpg --dearmor - \
| sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
| gpg --dearmor - \
| sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${lsb_codename} main"
sudo apt-get update -y
sudo apt-get install cmake -y
Expand Down
6 changes: 3 additions & 3 deletions scripts/debian/include-focal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function install-cmake() {
echo "::group::Installing CMake"
sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget -y
curl https://apt.kitware.com/keys/kitware-archive-latest.asc \
| gpg --dearmor - \
| sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
| gpg --dearmor - \
| sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ ${lsb_codename} main"
sudo apt-get update -y
sudo apt-get install cmake -y
Expand All @@ -42,7 +42,7 @@ function install-deb-s3() {
if [[ "${deb_arch:-}" == "armhf" ]]; then
gem sources -r https://rubygems.org/
echo -e "---\n :ssl_verify_mode: 0\n :backtrace: false\n :bulk_threshold: 1000\n :sources: ["http://rubygems.org"]\n :update_sources: true\n :verbose: true\n" > ~/.gemrc
gem update --system
gem update --system 3.4.22
fi
sudo gem install deb-s3
}
Loading