Skip to content
Snippets Groups Projects
Commit 2dc8fda8 authored by jenkins's avatar jenkins
Browse files

New release.

parents 7063e05a 989f2bd8
No related branches found
No related tags found
No related merge requests found
...@@ -76,9 +76,6 @@ pipeline { ...@@ -76,9 +76,6 @@ pipeline {
' submodules at their Git-recorded commit. When left ' + ' submodules at their Git-recorded commit. When left ' +
'unticked (the default), checkout the submodules at ' + 'unticked (the default), checkout the submodules at ' +
'their latest commit from their main remote branch.') 'their latest commit from their main remote branch.')
booleanParam(name: 'BUILD_ARM',
defaultValue: false,
description: 'Whether to build ARM packages.')
booleanParam(name: 'DEPLOY', booleanParam(name: 'DEPLOY',
defaultValue: false, defaultValue: false,
description: 'Whether to deploy packages.') description: 'Whether to deploy packages.')
...@@ -207,9 +204,6 @@ git tag \$(cat .tarball-version) -am "Jami \$(cat .tarball-version)" ...@@ -207,9 +204,6 @@ git tag \$(cat .tarball-version) -am "Jami \$(cat .tarball-version)"
} }
TARGETS = targetsText.split(/\s/) TARGETS = targetsText.split(/\s/)
if (!params.BUILD_ARM) {
TARGETS = TARGETS.findAll { !(it =~ /_(armhf|arm64)$/) }
}
def stages = [:] def stages = [:]
......
ARG RISK=edge ARG RISK=edge
ARG UBUNTU=xenial ARG UBUNTU=focal
FROM ubuntu:$UBUNTU as builder FROM ubuntu:$UBUNTU as builder
ARG RISK ARG RISK
...@@ -22,7 +22,7 @@ RUN unsquashfs -d /snap/core/current core.snap ...@@ -22,7 +22,7 @@ RUN unsquashfs -d /snap/core/current core.snap
# Grab the core22 snap (which snapcraft uses as a base) from the stable channel # Grab the core22 snap (which snapcraft uses as a base) from the stable channel
# and unpack it in the proper place. # and unpack it in the proper place.
RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core22?channel=edge' | jq '.download_url' -r) --output core22.snap RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core22?channel='$RISK | jq '.download_url' -r) --output core22.snap
RUN mkdir -p /snap/core22 RUN mkdir -p /snap/core22
RUN unsquashfs -d /snap/core22/current core22.snap RUN unsquashfs -d /snap/core22/current core22.snap
...@@ -32,6 +32,12 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna ...@@ -32,6 +32,12 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna
RUN mkdir -p /snap/core20 RUN mkdir -p /snap/core20
RUN unsquashfs -d /snap/core20/current core20.snap RUN unsquashfs -d /snap/core20/current core20.snap
# Grab the core20 snap (which snapcraft uses as a base) from the stable channel
# and unpack it in the proper place.
RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/lxd' | jq '.download_url' -r) --output lxd.snap
RUN mkdir -p /snap/lxd
RUN unsquashfs -d /snap/lxd/current lxd.snap
# Grab the snapcraft snap from the $RISK channel and unpack it in the proper # Grab the snapcraft snap from the $RISK channel and unpack it in the proper
# place. # place.
RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel='$RISK | jq '.download_url' -r) --output snapcraft.snap RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel='$RISK | jq '.download_url' -r) --output snapcraft.snap
...@@ -59,17 +65,18 @@ FROM ubuntu:$UBUNTU ...@@ -59,17 +65,18 @@ FROM ubuntu:$UBUNTU
COPY --from=builder /snap/core /snap/core COPY --from=builder /snap/core /snap/core
COPY --from=builder /snap/core22 /snap/core22 COPY --from=builder /snap/core22 /snap/core22
COPY --from=builder /snap/core20 /snap/core20 COPY --from=builder /snap/core20 /snap/core20
COPY --from=builder /snap/lxd /snap/lxd
COPY --from=builder /snap/snapcraft /snap/snapcraft COPY --from=builder /snap/snapcraft /snap/snapcraft
COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft
# Generate locale and install dependencies. # Generate locale and install dependencies.
RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo locales && locale-gen en_US.UTF-8 RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo apt-transport-https locales && locale-gen en_US.UTF-8
# Set the proper environment. # Set the proper environment.
ENV LANG="en_US.UTF-8" ENV LANG="en_US.UTF-8"
ENV LANGUAGE="en_US:en" ENV LANGUAGE="en_US:en"
ENV LC_ALL="en_US.UTF-8" ENV LC_ALL="en_US.UTF-8"
ENV PATH="/snap/bin:/snap/snapcraft/current/usr/bin:$PATH" ENV PATH="/snap/bin:/snap/snapcraft/current/usr/bin:/snap/snapcraft/current/libexec/snapcraft/:$PATH"
ENV SNAP="/snap/snapcraft/current" ENV SNAP="/snap/snapcraft/current"
ENV SNAP_NAME="snapcraft" ENV SNAP_NAME="snapcraft"
ENV SNAP_ARCH="amd64" ENV SNAP_ARCH="amd64"
......
...@@ -85,13 +85,13 @@ description: | ...@@ -85,13 +85,13 @@ description: |
confinement: strict confinement: strict
grade: stable grade: stable
base: core22 base: core20
plugs: plugs:
gnome-42-2204: gnome-3-38-2004:
interface: content interface: content
target: $SNAP/gnome-platform target: $SNAP/gnome-platform
default-provider: gnome-42-2204:gnome-42-2204 default-provider: gnome-3-38-2004:gnome-3-38-2004
gtk-3-themes: gtk-3-themes:
interface: content interface: content
target: $SNAP/data-dir/themes target: $SNAP/data-dir/themes
...@@ -168,7 +168,7 @@ package-repositories: ...@@ -168,7 +168,7 @@ package-repositories:
components: [main] components: [main]
suites: [jami] suites: [jami]
key-id: A295D773307D25A33AE72F2F64CD5FA175348F84 key-id: A295D773307D25A33AE72F2F64CD5FA175348F84
url: https://dl.jami.net/nightly/ubuntu_22.04/ url: https://dl.jami.net/nightly/ubuntu_20.04/
parts: parts:
desktop-launch: desktop-launch:
...@@ -329,7 +329,7 @@ parts: ...@@ -329,7 +329,7 @@ parts:
- libgstreamer-plugins-base1.0-0 - libgstreamer-plugins-base1.0-0
- libgstreamer1.0-0 - libgstreamer1.0-0
- libgudev-1.0-0 - libgudev-1.0-0
- libjsoncpp25 - libjsoncpp1
- libllvm12 - libllvm12
- libminizip1 - libminizip1
- libnm0 - libnm0
......
...@@ -30,7 +30,7 @@ cd /opt/jami-project/packaging/rules/snap/${SNAP_PKG_NAME}/ ...@@ -30,7 +30,7 @@ cd /opt/jami-project/packaging/rules/snap/${SNAP_PKG_NAME}/
# set the version and tarball filename # set the version and tarball filename
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" snapcraft.yaml sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" snapcraft.yaml
snapcraft # requires snapcraft >= 4.8 snapcraft --destructive-mode # requires snapcraft >= 4.8
# move the built snap to output # move the built snap to output
mv *.snap /opt/output/ mv *.snap /opt/output/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment