git.samba.org
/
vlendec
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9edd726
)
gitlab-ci: Add ccache and wget
author
Andreas Schneider
<asn@samba.org>
Sun, 29 Mar 2020 14:49:51 +0000
(16:49 +0200)
committer
Andreas Schneider
<asn@cryptomilk.org>
Wed, 1 Apr 2020 05:46:30 +0000
(
05:46
+0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
23 files changed:
.gitlab-ci.yml
patch
|
blob
|
history
bootstrap/config.py
patch
|
blob
|
history
bootstrap/generated-dists/centos7/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/centos7/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/centos8/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/centos8/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/debian10/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/debian10/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/fedora31/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/fedora31/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/fedora32/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/fedora32/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/opensuse150/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/opensuse150/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/opensuse151/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/opensuse151/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu1604/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu1604/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu1804/packages.yml
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu2004/bootstrap.sh
patch
|
blob
|
history
bootstrap/generated-dists/ubuntu2004/packages.yml
patch
|
blob
|
history
bootstrap/sha1sum.txt
patch
|
blob
|
history
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 0fcbf80cef1689f229e4e90923642942cadc0e4f..12b76028aa5ffcbb8f82bbd42e8e39b336245320 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-22,7
+22,7
@@
variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG:
7414ad7ef9108d406b1f6b17ebce19e32aee9f70
+ SAMBA_CI_CONTAINER_TAG:
c6ee634a9467e84ee8dd858b0b363f7a75973a66
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
diff --git
a/bootstrap/config.py
b/bootstrap/config.py
index 196f9bdf8ebba80f18a15062822245020dd78089..62a59b5cc57121e01d236dc3e2aeb597f4c1feb7 100644
(file)
--- a/
bootstrap/config.py
+++ b/
bootstrap/config.py
@@
-36,6
+36,7
@@
COMMON = [
'autoconf',
'binutils',
'bison',
+ 'ccache',
'curl',
'chrpath',
'flex',
@@
-56,6
+57,7
@@
COMMON = [
'sudo', # docker images has no sudo by default
'tar',
'tree',
+ 'wget',
]
diff --git
a/bootstrap/generated-dists/centos7/bootstrap.sh
b/bootstrap/generated-dists/centos7/bootstrap.sh
index 37f5d6846631ddb765fc2254a8ff774dd26b6ffb..9c81a1e1e686a16168066b236d5bfcddb46f6ae9 100755
(executable)
--- a/
bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/
bootstrap/generated-dists/centos7/bootstrap.sh
@@
-22,6
+22,7
@@
yum install -y \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
compat-gnutls34-devel \
cups-devel \
@@
-99,6
+100,7
@@
yum install -y \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/centos7/packages.yml
b/bootstrap/generated-dists/centos7/packages.yml
index 1b80882bd8c02297f0d4e6e7d66a3e1e8105654b..55502974829d4c35f55536d099d6aa6a00a2bed3 100644
(file)
--- a/
bootstrap/generated-dists/centos7/packages.yml
+++ b/
bootstrap/generated-dists/centos7/packages.yml
@@
-8,6
+8,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- compat-gnutls34-devel
- cups-devel
@@
-85,6
+86,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/centos8/bootstrap.sh
b/bootstrap/generated-dists/centos8/bootstrap.sh
index 61debd5e2ee45a749697ca5b40545d1971bea8de..a211daf2162bb55ebb97b9fdf5cae65afbe3cf1b 100755
(executable)
--- a/
bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/
bootstrap/generated-dists/centos8/bootstrap.sh
@@
-23,6
+23,7
@@
yum install -y \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
cups-devel \
curl \
@@
-103,6
+104,7
@@
yum install -y \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/centos8/packages.yml
b/bootstrap/generated-dists/centos8/packages.yml
index 2467b35dafb112f18816435a27869465fb0961e4..4d87303bcc244a069ae8e72dc51f8c585c48cb15 100644
(file)
--- a/
bootstrap/generated-dists/centos8/packages.yml
+++ b/
bootstrap/generated-dists/centos8/packages.yml
@@
-8,6
+8,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- cups-devel
- curl
@@
-88,6
+89,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/debian10/bootstrap.sh
b/bootstrap/generated-dists/debian10/bootstrap.sh
index 9391c1ca815eb5c72a2ffc934edc20684ae68e28..94f85473811d66ee27735000b011026c2af0095c 100755
(executable)
--- a/
bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/
bootstrap/generated-dists/debian10/bootstrap.sh
@@
-19,6
+19,7
@@
apt-get -y install \
binutils \
bison \
build-essential \
+ ccache \
chrpath \
curl \
debhelper \
@@
-98,6
+99,7
@@
apt-get -y install \
tar \
tree \
uuid-dev \
+ wget \
xfslibs-dev \
xsltproc \
zlib1g-dev
diff --git
a/bootstrap/generated-dists/debian10/packages.yml
b/bootstrap/generated-dists/debian10/packages.yml
index dee4d5cef201bb01b1af0d22227fd5cfc5670269..ff45afedf937ac64d6f7ee331cddf12ea33a7891 100644
(file)
--- a/
bootstrap/generated-dists/debian10/packages.yml
+++ b/
bootstrap/generated-dists/debian10/packages.yml
@@
-8,6
+8,7
@@
packages:
- binutils
- bison
- build-essential
+ - ccache
- chrpath
- curl
- debhelper
@@
-87,6
+88,7
@@
packages:
- tar
- tree
- uuid-dev
+ - wget
- xfslibs-dev
- xsltproc
- zlib1g-dev
\ No newline at end of file
diff --git
a/bootstrap/generated-dists/fedora31/bootstrap.sh
b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 09d36e8805863786aa692c93a8230e082fbc5599..4bbda3ce3c83f6d6c63e224fd0bf6fd26856b08c 100755
(executable)
--- a/
bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/
bootstrap/generated-dists/fedora31/bootstrap.sh
@@
-19,6
+19,7
@@
dnf install -y \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
cups-devel \
curl \
@@
-103,6
+104,7
@@
dnf install -y \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/fedora31/packages.yml
b/bootstrap/generated-dists/fedora31/packages.yml
index a2fbd0eb83bd821818e3b07fb2b97593d22f5685..4a8356cddb31d6f9c3e521e190a898a1ab4dfe64 100644
(file)
--- a/
bootstrap/generated-dists/fedora31/packages.yml
+++ b/
bootstrap/generated-dists/fedora31/packages.yml
@@
-8,6
+8,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- cups-devel
- curl
@@
-92,6
+93,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/fedora32/bootstrap.sh
b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 09d36e8805863786aa692c93a8230e082fbc5599..4bbda3ce3c83f6d6c63e224fd0bf6fd26856b08c 100755
(executable)
--- a/
bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/
bootstrap/generated-dists/fedora32/bootstrap.sh
@@
-19,6
+19,7
@@
dnf install -y \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
cups-devel \
curl \
@@
-103,6
+104,7
@@
dnf install -y \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/fedora32/packages.yml
b/bootstrap/generated-dists/fedora32/packages.yml
index a2fbd0eb83bd821818e3b07fb2b97593d22f5685..4a8356cddb31d6f9c3e521e190a898a1ab4dfe64 100644
(file)
--- a/
bootstrap/generated-dists/fedora32/packages.yml
+++ b/
bootstrap/generated-dists/fedora32/packages.yml
@@
-8,6
+8,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- cups-devel
- curl
@@
-92,6
+93,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/opensuse150/bootstrap.sh
b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 341b0ef9d3537ac6d7385ac584a813e4965fd25b..1a38fbdef22604093ca3622da96dfe5a56df5d5e 100755
(executable)
--- a/
bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/
bootstrap/generated-dists/opensuse150/bootstrap.sh
@@
-19,6
+19,7
@@
zypper --non-interactive install \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
cups-devel \
curl \
@@
-95,6
+96,7
@@
zypper --non-interactive install \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/opensuse150/packages.yml
b/bootstrap/generated-dists/opensuse150/packages.yml
index b8c469cadca40438f2cfe6168534621eb8f54f84..bfb352f749efb2dd79762d2f1cd0df24c69166f4 100644
(file)
--- a/
bootstrap/generated-dists/opensuse150/packages.yml
+++ b/
bootstrap/generated-dists/opensuse150/packages.yml
@@
-7,6
+7,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- cups-devel
- curl
@@
-83,6
+84,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/opensuse151/bootstrap.sh
b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 341b0ef9d3537ac6d7385ac584a813e4965fd25b..1a38fbdef22604093ca3622da96dfe5a56df5d5e 100755
(executable)
--- a/
bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/
bootstrap/generated-dists/opensuse151/bootstrap.sh
@@
-19,6
+19,7
@@
zypper --non-interactive install \
bind-utils \
binutils \
bison \
+ ccache \
chrpath \
cups-devel \
curl \
@@
-95,6
+96,7
@@
zypper --non-interactive install \
systemd-devel \
tar \
tree \
+ wget \
which \
xfsprogs-devel \
yum-utils \
diff --git
a/bootstrap/generated-dists/opensuse151/packages.yml
b/bootstrap/generated-dists/opensuse151/packages.yml
index b8c469cadca40438f2cfe6168534621eb8f54f84..bfb352f749efb2dd79762d2f1cd0df24c69166f4 100644
(file)
--- a/
bootstrap/generated-dists/opensuse151/packages.yml
+++ b/
bootstrap/generated-dists/opensuse151/packages.yml
@@
-7,6
+7,7
@@
packages:
- bind-utils
- binutils
- bison
+ - ccache
- chrpath
- cups-devel
- curl
@@
-83,6
+84,7
@@
packages:
- systemd-devel
- tar
- tree
+ - wget
- which
- xfsprogs-devel
- yum-utils
diff --git
a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index f5791357d45286ad01a9a93892d556a129c22725..ab66f0884483d2d639c9078f8585c66e967ef8d1 100755
(executable)
--- a/
bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/
bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@
-19,6
+19,7
@@
apt-get -y install \
binutils \
bison \
build-essential \
+ ccache \
chrpath \
curl \
debhelper \
@@
-97,6
+98,7
@@
apt-get -y install \
tar \
tree \
uuid-dev \
+ wget \
xfslibs-dev \
xsltproc \
zlib1g-dev
diff --git
a/bootstrap/generated-dists/ubuntu1604/packages.yml
b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 932cc1620413afae769d1eaccec7972c87366c18..d0a773558b4057e59088235a292bee711eb0cb47 100644
(file)
--- a/
bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/
bootstrap/generated-dists/ubuntu1604/packages.yml
@@
-8,6
+8,7
@@
packages:
- binutils
- bison
- build-essential
+ - ccache
- chrpath
- curl
- debhelper
@@
-86,6
+87,7
@@
packages:
- tar
- tree
- uuid-dev
+ - wget
- xfslibs-dev
- xsltproc
- zlib1g-dev
\ No newline at end of file
diff --git
a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index e668057ea8200b5a4da12bfdec7b5e9a7f23f9b2..013f289d88074d75fe4e9fc5a5e956229ed6cbf8 100755
(executable)
--- a/
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@
-19,6
+19,7
@@
apt-get -y install \
binutils \
bison \
build-essential \
+ ccache \
chrpath \
curl \
debhelper \
@@
-99,6
+100,7
@@
apt-get -y install \
tar \
tree \
uuid-dev \
+ wget \
xfslibs-dev \
xsltproc \
zlib1g-dev
diff --git
a/bootstrap/generated-dists/ubuntu1804/packages.yml
b/bootstrap/generated-dists/ubuntu1804/packages.yml
index edf5720f84c9a78d081e7e6eeb2f2d061beb2a55..2ba03c496afb7d62f13c5e841904d001e9074eaf 100644
(file)
--- a/
bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/
bootstrap/generated-dists/ubuntu1804/packages.yml
@@
-8,6
+8,7
@@
packages:
- binutils
- bison
- build-essential
+ - ccache
- chrpath
- curl
- debhelper
@@
-88,6
+89,7
@@
packages:
- tar
- tree
- uuid-dev
+ - wget
- xfslibs-dev
- xsltproc
- zlib1g-dev
\ No newline at end of file
diff --git
a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index e668057ea8200b5a4da12bfdec7b5e9a7f23f9b2..013f289d88074d75fe4e9fc5a5e956229ed6cbf8 100755
(executable)
--- a/
bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/
bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@
-19,6
+19,7
@@
apt-get -y install \
binutils \
bison \
build-essential \
+ ccache \
chrpath \
curl \
debhelper \
@@
-99,6
+100,7
@@
apt-get -y install \
tar \
tree \
uuid-dev \
+ wget \
xfslibs-dev \
xsltproc \
zlib1g-dev
diff --git
a/bootstrap/generated-dists/ubuntu2004/packages.yml
b/bootstrap/generated-dists/ubuntu2004/packages.yml
index edf5720f84c9a78d081e7e6eeb2f2d061beb2a55..2ba03c496afb7d62f13c5e841904d001e9074eaf 100644
(file)
--- a/
bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/
bootstrap/generated-dists/ubuntu2004/packages.yml
@@
-8,6
+8,7
@@
packages:
- binutils
- bison
- build-essential
+ - ccache
- chrpath
- curl
- debhelper
@@
-88,6
+89,7
@@
packages:
- tar
- tree
- uuid-dev
+ - wget
- xfslibs-dev
- xsltproc
- zlib1g-dev
\ No newline at end of file
diff --git
a/bootstrap/sha1sum.txt
b/bootstrap/sha1sum.txt
index 085ef7c529768956b0b9b52e467e1858e85f7f3a..97c1408594b2d9600813b67dc0c177b8e5012139 100644
(file)
--- a/
bootstrap/sha1sum.txt
+++ b/
bootstrap/sha1sum.txt
@@
-1
+1
@@
-7414ad7ef9108d406b1f6b17ebce19e32aee9f70
+c6ee634a9467e84ee8dd858b0b363f7a75973a66