Skip to content
Snippets Groups Projects
Commit 280f813e authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents 0f681c51 cbf6824d
No related branches found
No related tags found
No related merge requests found
......@@ -112,6 +112,8 @@ package-all: package-debian_9 \
package-fedora_31_i386 \
package-fedora_32 \
package-fedora_32_i386 \
package-fedora_33 \
package-fedora_33_i386 \
package-rhel_8 \
package-opensuse-leap_15.1 \
package-opensuse-leap_15.2 \
......
client-gnome @ 82eb5e86
Subproject commit 0b7dd069518bb896724b3d322719af76daa60ceb
Subproject commit 82eb5e8621ff3a8da2b56a1f9f9bba59a1ae6358
daemon @ 3f1c2f90
Subproject commit 3a0ce1eababb5e928975826c6b411caf8685caae
Subproject commit 3f1c2f90b227698e73837b6990364fbc7b6824cd
FROM fedora:33
RUN dnf clean all
RUN dnf install -y dnf-command\(builddep\) rpmdevtools
RUN dnf clean all
RUN dnf upgrade -y && \
dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
dnf install -y libinput-devel && \
dnf install -y \
git \
rpm-build \
tar \
make \
autoconf \
automake \
nasm \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
libcanberra-devel \
libcurl-devel \
libtool \
dbus-devel \
expat-devel \
pcre-devel \
yaml-cpp-devel \
boost-devel \
dbus-c++-devel \
dbus-devel \
libXext-devel \
libXfixes-devel \
yasm \
speex-devel \
gsm-devel \
chrpath \
check \
astyle \
uuid-c++-devel \
gettext-devel \
gcc-c++ \
which \
alsa-lib-devel \
systemd-devel \
libuuid-devel \
uuid-devel \
gnutls-devel \
nettle-devel \
opus-devel \
patch \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel \
libvdpau-devel \
msgpack-devel \
NetworkManager-libnm-devel \
openssl-devel \
openssl-static \
clutter-devel \
clutter-gtk-devel \
libappindicator-gtk3-devel \
libnotify-devel \
libupnp-devel \
qrencode-devel \
qt5-qtbase-devel \
qt5-qttools-devel \
sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
CMD /opt/build-package-fedora.sh
lrc @ 643cb416
Subproject commit 2d3b1f017cbb824172a3b605af6efa453dd0edc9
Subproject commit 643cb41619580480b75f5a6c66f3364f6abeb307
......@@ -145,22 +145,23 @@ PACMAN_DEPENDENCIES = [
OSX_DEPENDENCIES = [
'autoconf', 'cmake', 'gettext', 'pkg-config', 'qt5',
'libtool', 'yasm', 'nasm', 'automake'
'libtool', 'yasm', 'nasm', 'automake', 'libtasn'
]
OSX_DEPENDENCIES_UNLINK = [
'autoconf*', 'cmake*', 'gettext*', 'pkg-config*', 'qt*', 'qt@5.*',
'libtool*', 'yasm*', 'nasm*', 'automake*', 'gnutls*', 'nettle*', 'msgpack*'
'libtool*', 'yasm*', 'nasm*', 'automake*', 'gnutls*', 'nettle*', 'msgpack*',
'libtasn'
]
IOS_DEPENDENCIES = [
'autoconf', 'automake', 'cmake', 'yasm', 'libtool',
'pkg-config', 'gettext', 'swiftlint', 'swiftgen'
'pkg-config', 'gettext', 'swiftlint', 'swiftgen', 'libtasn'
]
IOS_DEPENDENCIES_UNLINK = [
'autoconf*', 'automake*', 'cmake*', 'yasm*', 'libtool*',
'pkg-config*', 'gettext*', 'swiftlint*', 'swiftgen*'
'pkg-config*', 'gettext*', 'swiftlint*', 'swiftgen*', 'libtasn'
]
UNINSTALL_SCRIPT = [
......
......@@ -107,6 +107,8 @@ enabled=1'
ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
ENDTAG="fedora_33"
else
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_YUM_SOURCE=false
......
......@@ -107,6 +107,8 @@ enabled=1'
ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
ENDTAG="fedora_33"
elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then
ENDTAG="opensuse-leap_15.1"
REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
......
......@@ -99,6 +99,8 @@ enabled=1'
ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
ENDTAG="fedora_33"
else
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_YUM_SOURCE=false
......
......@@ -36,7 +36,7 @@ cp /opt/ring-project-ro/jami_*.tar.gz /root/rpmbuild/SOURCES
# Set the version
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" *.spec
if [ ${DISTRIBUTION} == "fedora_32" ]; then
if [ ${DISTRIBUTION} == "fedora_32" ] || [ ${DISTRIBUTION} == "fedora_33" ]; then
# Remove Obsoletes for Fedora 32, as we don't publish "ring"
sed -i '/^Obsoletes:/d' *.spec
sed -i '/^Provides:/d' *.spec
......
......@@ -356,6 +356,18 @@ def run_generate_all(parsed_args):
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
{
"distribution": "fedora_33",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
{
"distribution": "fedora_33_i386",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
{
"distribution": "rhel_8",
"debian_packaging_override": "",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment