thodg/libgit2

Browse

Commit 7632738160912f7767d57f24d998922c513d2d38

Patrick Steinhardt 2019-08-02T10:50:11

azure: deprecate Trusty in favor of Xenial Support for the LTS release Ubuntu 14.04 Trusty has been dropped in April 2019, but Azure is still using Trusty as its primary platform to build and test against. Let's deprecate it in favor of Xenial. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 231981d..48f6734 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,61 +6,61 @@ trigger:
 - maint/*
 
 jobs:
-- job: linux_amd64_trusty_gcc_openssl
-  displayName: 'Linux (amd64; Trusty; GCC; OpenSSL)'
+- job: linux_amd64_xenial_gcc_openssl
+  displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: azure-pipelines/docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=gcc
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
 
-- job: linux_amd64_trusty_gcc_mbedtls
-  displayName: 'Linux (amd64; Trusty; GCC; mbedTLS)'
+- job: linux_amd64_xenial_gcc_mbedtls
+  displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: azure-pipelines/docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=gcc
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
 
-- job: linux_amd64_trusty_clang_openssl
-  displayName: 'Linux (amd64; Trusty; Clang; OpenSSL)'
+- job: linux_amd64_xenial_clang_openssl
+  displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: azure-pipelines/docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=clang
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
 
-- job: linux_amd64_trusty_clang_mbedtls
-  displayName: 'Linux (amd64; Trusty; Clang; mbedTLS)'
+- job: linux_amd64_xenial_clang_mbedtls
+  displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: azure-pipelines/docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=clang
        CMAKE_GENERATOR=Unix Makefiles
diff --git a/azure-pipelines/docker/trusty b/azure-pipelines/docker/trusty
deleted file mode 100644
index 67e6ec1..0000000
--- a/azure-pipelines/docker/trusty
+++ /dev/null
@@ -1,20 +0,0 @@
-ARG BASE
-FROM $BASE
-ARG CACHEBUST=1
-
-RUN apt-get update
-RUN apt-get install -y curl apt-transport-https software-properties-common
-RUN curl -sSL "https://bintray.com/user/downloadSubjectPublicKey?username=bintray" | apt-key add -
-RUN echo "deb https://dl.bintray.com/libgit2/ci-dependencies trusty libgit2deps" >> /etc/apt/sources.list
-RUN add-apt-repository ppa:openjdk-r/ppa -y
-RUN apt-get update
-RUN apt-get -y install clang git cmake libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libssh2-1-dev valgrind openssh-client openssh-server openjdk-8-jre libpcre3 libpcre3-dev
-
-RUN git clone --branch mbedtls-2.6.1 https://github.com/ARMmbed/mbedtls.git /tmp/mbedtls
-RUN (cd /tmp/mbedtls && scripts/config.pl set MBEDTLS_MD4_C 1)
-RUN (cd /tmp/mbedtls && CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON .)
-RUN (cd /tmp/mbedtls && cmake --build .)
-RUN (cd /tmp/mbedtls && make install)
-RUN rm -rf /tmp/mbedtls
-
-RUN mkdir /var/run/sshd
diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml
index 8bcccd7..a221ede 100644
--- a/azure-pipelines/nightly.yml
+++ b/azure-pipelines/nightly.yml
@@ -2,64 +2,64 @@ resources:
 - repo: self
 
 jobs:
-- job: linux_amd64_trusty_gcc_openssl
-  displayName: 'Linux (amd64; Trusty; GCC; OpenSSL)'
+- job: linux_amd64_xenial_gcc_openssl
+  displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=gcc
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
        RUN_INVASIVE_TESTS=true
 
-- job: linux_amd64_trusty_gcc_mbedtls
-  displayName: 'Linux (amd64; Trusty; GCC; mbedTLS)'
+- job: linux_amd64_xenial_gcc_mbedtls
+  displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=gcc
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
        RUN_INVASIVE_TESTS=true
 
-- job: linux_amd64_trusty_clang_openssl
-  displayName: 'Linux (amd64; Trusty; Clang; OpenSSL)'
+- job: linux_amd64_xenial_clang_openssl
+  displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=clang
        CMAKE_GENERATOR=Unix Makefiles
        CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
        RUN_INVASIVE_TESTS=true
 
-- job: linux_amd64_trusty_clang_mbedtls
-  displayName: 'Linux (amd64; Trusty; Clang; mbedTLS)'
+- job: linux_amd64_xenial_clang_mbedtls
+  displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - template: docker.yml
     parameters:
       docker:
-        image: trusty
-        base: ubuntu:trusty
+        image: xenial
+        base: ubuntu:xenial
       environmentVariables: |
        CC=clang
        CMAKE_GENERATOR=Unix Makefiles
kmx.io     mail     discord kmxgit v0.4.0