Skip to content

Commit 6844e70

Browse files
committed
Remove unneeded builds
1 parent f3f0435 commit 6844e70

10 files changed

+5
-83
lines changed

.travis.yml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,13 @@ matrix:
1212
- os: linux
1313
dist: trusty
1414
sudo: required
15-
env: RID=ubuntu.18.04-x64
15+
env: RID=linux-musl-x64
1616
- os: linux
1717
dist: trusty
1818
sudo: required
19-
env: RID=rhel-x64
20-
- os: linux
21-
dist: trusty
22-
sudo: required
23-
env: RID=fedora-x64
24-
- os: linux
25-
dist: trusty
26-
sudo: required
27-
env: RID=debian.9-x64
28-
- os: linux
29-
dist: trusty
30-
sudo: required
31-
env: RID=alpine-x64
32-
- os: linux
33-
dist: trusty
34-
sudo: required
35-
env: RID=alpine.3.9-x64
19+
env: RID=linux-arm64
3620
- os: osx
3721
env: RID=osx
38-
- os: linux
39-
dist: trusty
40-
sudo: required
41-
env: RID=ubuntu.16.04-arm64
42-
- os: linux
43-
dist: trusty
44-
sudo: required
45-
env: RID=debian-arm64
4622

4723
branches:
4824
only:

Dockerfile.alpine.3.9-x64

Lines changed: 0 additions & 7 deletions
This file was deleted.

Dockerfile.debian.9-x64

Lines changed: 0 additions & 7 deletions
This file was deleted.

Dockerfile.fedora-x64

Lines changed: 0 additions & 7 deletions
This file was deleted.

Dockerfile.debian-arm64 renamed to Dockerfile.linux-arm64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ RUN dpkg --add-architecture arm64
66

77
RUN apt update \
88
&& apt -y install cmake pkg-config \
9-
crossbuild-essential-arm64 \
10-
libssl-dev:arm64
9+
crossbuild-essential-arm64
1110

1211
CMD ["/bin/bash", "-c", "./build.libgit2.sh"]

Dockerfile.alpine-x64 renamed to Dockerfile.linux-musl-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ FROM alpine:3.7
22
WORKDIR /nativebinaries
33
COPY . /nativebinaries/
44

5-
RUN apk add --no-cache bash build-base cmake openssl-dev
5+
RUN apk add --no-cache bash build-base cmake
66

77
CMD ["/bin/bash", "-c", "./build.libgit2.sh"]

Dockerfile.linux-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:14.04
22
WORKDIR /nativebinaries
33
COPY . /nativebinaries/
44

5-
RUN apt update && apt -y install libssl-dev pkg-config curl make gcc build-essential
5+
RUN apt update && apt -y install pkg-config curl make gcc build-essential
66

77
RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh -o /tmp/cmake.sh && bash /tmp/cmake.sh --skip-license --prefix=/usr/local
88

Dockerfile.rhel-x64

Lines changed: 0 additions & 8 deletions
This file was deleted.

Dockerfile.ubuntu.16.04-arm64

Lines changed: 0 additions & 17 deletions
This file was deleted.

Dockerfile.ubuntu.18.04-x64

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)