Skip to content

Commit

Permalink
Refactor the build system
Browse files Browse the repository at this point in the history
  • Loading branch information
@Silex
Silex committed Jun 12, 2018
1 parent 138f26b commit ffd78ae
Show file tree
Hide file tree
Showing 43 changed files with 661 additions and 780 deletions.
60 changes: 32 additions & 28 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,43 @@ services: docker
cache:
timeout: 900
directories:
- $HOME/cache
- $HOME/cache

env:
- IMAGE_TAGS="master" IMAGE_DIRECTORY="master/xenial" GIT_BRANCH="master"
- IMAGE_TAGS="master-dev" IMAGE_DIRECTORY="master/xenial/dev" GIT_BRANCH="master"
- IMAGE_TAGS="master-alpine" IMAGE_DIRECTORY="master/alpine" GIT_BRANCH="master"
- IMAGE_TAGS="26.1 26 latest" IMAGE_DIRECTORY="26.1/xenial" GIT_BRANCH="emacs-26.1"
- IMAGE_TAGS="26.1-dev 26-dev dev" IMAGE_DIRECTORY="26.1/xenial/dev" GIT_BRANCH="emacs-26.1"
- IMAGE_TAGS="26.1-alpine 26-alpine alpine" IMAGE_DIRECTORY="26.1/alpine" GIT_BRANCH="emacs-26.1"
- IMAGE_TAGS="25.3 25" IMAGE_DIRECTORY="25.3/xenial" GIT_BRANCH="emacs-25.3"
- IMAGE_TAGS="25.3-dev 25-dev" IMAGE_DIRECTORY="25.3/xenial/dev" GIT_BRANCH="emacs-25.3"
- IMAGE_TAGS="25.3-alpine 25-alpine" IMAGE_DIRECTORY="25.3/alpine" GIT_BRANCH="emacs-25.3"
- IMAGE_TAGS="25.2" IMAGE_DIRECTORY="25.2/xenial" GIT_BRANCH="emacs-25.2"
- IMAGE_TAGS="25.2-dev" IMAGE_DIRECTORY="25.2/xenial/dev" GIT_BRANCH="emacs-25.2"
- IMAGE_TAGS="25.2-alpine" IMAGE_DIRECTORY="25.2/alpine" GIT_BRANCH="emacs-25.2"
- IMAGE_TAGS="25.1" IMAGE_DIRECTORY="25.1/xenial" GIT_BRANCH="emacs-25.1"
- IMAGE_TAGS="25.1-dev" IMAGE_DIRECTORY="25.1/xenial/dev" GIT_BRANCH="emacs-25.1"
- IMAGE_TAGS="24.5 24" IMAGE_DIRECTORY="24.5/xenial" GIT_BRANCH="emacs-24.5"
- IMAGE_TAGS="24.5-dev 24-dev" IMAGE_DIRECTORY="24.5/xenial/dev" GIT_BRANCH="emacs-24.5"
- IMAGE_TAGS="24.4" IMAGE_DIRECTORY="24.4/precise/autogen" GIT_BRANCH="emacs-24.4"
- IMAGE_TAGS="24.4-dev" IMAGE_DIRECTORY="24.4/precise/autogen/dev" GIT_BRANCH="emacs-24.4"
- IMAGE_TAGS="24.3" IMAGE_DIRECTORY="24.3/precise/autogen" GIT_BRANCH="emacs-24.3"
- IMAGE_TAGS="24.3-dev" IMAGE_DIRECTORY="24.3/precise/autogen/dev" GIT_BRANCH="emacs-24.3"
- IMAGE_TAGS="23.4 23" IMAGE_DIRECTORY="23.4/precise/bootstrap" GIT_BRANCH="emacs-23.4"
- IMAGE_TAGS="23.4-dev 23-dev" IMAGE_DIRECTORY="23.4/precise/bootstrap/dev" GIT_BRANCH="emacs-23.4"
- DOCKER_IMAGES="master-dev master"
- DOCKER_IMAGES="master-alpine-dev master-alpine"
- DOCKER_IMAGES="26.1-dev 26.1"
- DOCKER_IMAGES="26.1-alpine-dev 26.1-alpine"
- DOCKER_IMAGES="25.3-dev 25.3"
- DOCKER_IMAGES="25.3-alpine-dev 25.3-alpine"
- DOCKER_IMAGES="25.2-dev 25.2"
- DOCKER_IMAGES="25.2-alpine-dev 25.2-alpine"
- DOCKER_IMAGES="25.1-dev 25.1"
- DOCKER_IMAGES="24.5-dev 24.5"
- DOCKER_IMAGES="24.4-dev 24.4"
- DOCKER_IMAGES="24.3-dev 24.3"
- DOCKER_IMAGES="23.4-dev 23.4"

install:
- source bin/setup-env
- image-prepare "$GIT_REPOSITORY" "$GIT_BRANCH" "$TRAVIS_CACHE/emacs/$GIT_BRANCH" "$IMAGE_DIRECTORY"
- docker-load-images "$TRAVIS_CACHE/docker/images.tar"
- image-build "$DOCKER_REPOSITORY" "$IMAGE_TAGS" "$IMAGE_DIRECTORY"
- image-push "$DOCKER_REPOSITORY" "$IMAGE_TAGS"
- docker-save-images "$TRAVIS_CACHE/docker/images.tar"
- images prepare $DOCKER_IMAGES

script:
- images build $DOCKER_IMAGES

after_success:
- |
# DOCKER_USERNAME is empty for forked repositories
# TRAVIS_PULL_REQUEST is "true" for pull requests
# TRAVIS_BRANCH is the current branch or the PR target branch
# TRAVIS_PULL_REQUEST_BRANCH is the PR source branch
github_branch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
if [[ ! -z "$DOCKER_USERNAME" ]] && [[ "$TRAVIS_PULL_REQUEST" != "true" ]] && \
[[ "$github_branch" == "master" ]] || [[ "$github_branch" == "staging-"* ]]; then
images push $DOCKER_IMAGES
else
echo ">>> not pushing"
fi
notifications:
email:
Expand Down
37 changes: 0 additions & 37 deletions 23.4/precise/bootstrap/dev/Dockerfile
View file

This file was deleted.

14 changes: 12 additions & 2 deletions 23.4/precise/bootstrap/Dockerfile → 23.4/ubuntu/12.04/bootstrap/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ubuntu:12.04
FROM ubuntu:12.04 as dev

RUN apt-get update && \
apt-get install -y \
autoconf \
automake \
build-essential \
curl \
git \
imagemagick \
ispell \
libdbus-1-dev \
libgif-dev \
libgnutls-dev \
Expand All @@ -17,16 +20,23 @@ RUN apt-get update && \
libtiff-dev \
libx11-dev \
libxpm-dev \
python \
texinfo \
&& \
rm -rf /var/lib/apt/lists/*

COPY emacs-23.4 /opt/emacs
ENV EMACS_BRANCH="emacs-23.4"
ENV EMACS_VERSION="23.4"

COPY source /opt/emacs

RUN cd /opt/emacs && \
./configure --with-crt-dir=/usr/lib/x86_64-linux-gnu && \
make bootstrap && \
make -j 8 install

CMD ["emacs"]

# ------------------------------------------------------------

FROM ubuntu:12.04
Expand Down
40 changes: 0 additions & 40 deletions 24.3/precise/autogen/dev/Dockerfile
View file

This file was deleted.

17 changes: 15 additions & 2 deletions 24.3/precise/autogen/Dockerfile → 24.3/ubuntu/12.04/autogen/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ubuntu:12.04
FROM ubuntu:12.04 as dev

RUN apt-get update && \
apt-get install -y \
autoconf \
automake \
build-essential \
curl \
git \
imagemagick \
ispell \
libdbus-1-dev \
libgif-dev \
libgnutls-dev \
Expand All @@ -17,16 +20,26 @@ RUN apt-get update && \
libtiff-dev \
libx11-dev \
libxpm-dev \
python \
texinfo \
&& \
rm -rf /var/lib/apt/lists/*

COPY emacs-24.3 /opt/emacs
ENV EMACS_BRANCH="emacs-24.3"
ENV EMACS_VERSION="24.3"

COPY source /opt/emacs

RUN cd /opt/emacs && \
./autogen.sh && \
./configure && \
make -j 8 install

ENV PATH="/root/.cask/bin:$PATH"
RUN curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python

CMD ["emacs"]

# ------------------------------------------------------------

FROM ubuntu:12.04
Expand Down
40 changes: 0 additions & 40 deletions 24.4/precise/autogen/dev/Dockerfile
View file

This file was deleted.

17 changes: 15 additions & 2 deletions 24.4/precise/autogen/Dockerfile → 24.4/ubuntu/12.04/autogen/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ubuntu:12.04
FROM ubuntu:12.04 as dev

RUN apt-get update && \
apt-get install -y \
autoconf \
automake \
build-essential \
curl \
git \
imagemagick \
ispell \
libdbus-1-dev \
libgif-dev \
libgnutls-dev \
Expand All @@ -17,16 +20,26 @@ RUN apt-get update && \
libtiff-dev \
libx11-dev \
libxpm-dev \
python \
texinfo \
&& \
rm -rf /var/lib/apt/lists/*

COPY emacs-24.4 /opt/emacs
ENV EMACS_BRANCH="emacs-24.4"
ENV EMACS_VERSION="24.4"

COPY source /opt/emacs

RUN cd /opt/emacs && \
./autogen.sh && \
./configure && \
make -j 8 install

ENV PATH="/root/.cask/bin:$PATH"
RUN curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python

CMD ["emacs"]

# ------------------------------------------------------------

FROM ubuntu:12.04
Expand Down
17 changes: 15 additions & 2 deletions 24.5/xenial/Dockerfile → 24.5/ubuntu/16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ubuntu:16.04
FROM ubuntu:16.04 as dev

RUN apt-get update && \
apt-get install -y \
autoconf \
automake \
build-essential \
curl \
git \
imagemagick \
ispell \
libdbus-1-dev \
libgif-dev \
libgnutls-dev \
Expand All @@ -17,16 +20,26 @@ RUN apt-get update && \
libtiff-dev \
libx11-dev \
libxpm-dev \
python \
texinfo \
&& \
rm -rf /var/lib/apt/lists/*

COPY emacs-24.5 /opt/emacs
ENV EMACS_BRANCH="emacs-24.5"
ENV EMACS_VERSION="24.5"

COPY source /opt/emacs

RUN cd /opt/emacs && \
./autogen.sh && \
./configure && \
make -j 8 install

ENV PATH="/root/.cask/bin:$PATH"
RUN curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python

CMD ["emacs"]

# ------------------------------------------------------------

FROM ubuntu:16.04
Expand Down
Loading

0 comments on commit ffd78ae

Please sign in to comment.