[Updated] D9396: packaging: drop Disco (19.04) and add Focal (20.04)
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Sun Nov 29 18:40:42 UTC 2020
Closed by commit rHG971424517e17: packaging: drop Disco (19.04) and add Focal (20.04) (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9396?vs=23657&id=23852
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9396/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9396
AFFECTED FILES
Makefile
contrib/packaging/Makefile
contrib/packaging/docker/ubuntu.template
contrib/packaging/dockerdeb
CHANGE DETAILS
diff --git a/contrib/packaging/dockerdeb b/contrib/packaging/dockerdeb
--- a/contrib/packaging/dockerdeb
+++ b/contrib/packaging/dockerdeb
@@ -12,10 +12,12 @@
OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
CONTAINER=hg-docker-$PLATFORM
+TZ=`ls -la /etc/localtime | cut -d/ -f7-9`
DOCKER=$($BUILDDIR/hg-docker docker-path)
$BUILDDIR/hg-docker build \
+ --build-arg TZ=$TZ \
--build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \
$CONTAINER
diff --git a/contrib/packaging/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template
--- a/contrib/packaging/docker/ubuntu.template
+++ b/contrib/packaging/docker/ubuntu.template
@@ -3,6 +3,10 @@
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
+ARG DEBIAN_FRONTEND=noninteractive
+
+ENV TZ=%TZ%
+
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -9,7 +9,7 @@
xenial \
bionic \
cosmic \
- disco
+ focal
FEDORA_RELEASE := 31
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -205,6 +205,8 @@
docker-ubuntu-xenial-ppa \
docker-ubuntu-bionic \
docker-ubuntu-bionic-ppa \
+ docker-ubuntu-focal \
+ docker-ubuntu-focal-ppa \
fedora \
linux-wheels \
linux-wheels-x86_64 \
To: mharbison72, #hg-reviewers, pulkit
Cc: SimonSapin, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201129/8a5c67b7/attachment-0002.html>
More information about the Mercurial-patches
mailing list