Skip to content

Commit

Permalink
Build 29.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vermiculus authored and Silex committed Aug 2, 2023
1 parent 9f30574 commit 430afde
Show file tree
Hide file tree
Showing 13 changed files with 250 additions and 2 deletions.
118 changes: 118 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,124 @@ jobs:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: master-alpine-ci-keg
img-29-1:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: '29.1'
img-29-1-ci:
runs-on: ubuntu-latest
needs: img-29-1
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-ci
img-29-1-ci-cask:
runs-on: ubuntu-latest
needs: img-29-1-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-ci-cask
img-29-1-ci-eldev:
runs-on: ubuntu-latest
needs: img-29-1-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-ci-eldev
img-29-1-ci-keg:
runs-on: ubuntu-latest
needs: img-29-1-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-ci-keg
img-29-1-alpine:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-alpine
img-29-1-alpine-ci:
runs-on: ubuntu-latest
needs: img-29-1-alpine
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-alpine-ci
img-29-1-alpine-ci-cask:
runs-on: ubuntu-latest
needs: img-29-1-alpine-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-alpine-ci-cask
img-29-1-alpine-ci-eldev:
runs-on: ubuntu-latest
needs: img-29-1-alpine-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-alpine-ci-eldev
img-29-1-alpine-ci-keg:
runs-on: ubuntu-latest
needs: img-29-1-alpine-ci
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Build
uses: "./.github/actions/build"
with:
dockerhub_username: "${{ secrets.DOCKERHUB_USERNAME }}"
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"
emacs: 29.1-alpine-ci-keg
img-28-2:
runs-on: ubuntu-latest
steps:
Expand Down
20 changes: 20 additions & 0 deletions 29.1/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM nixos/nix

ADD https://api.github.com/repos/purcell/nix-emacs-ci/git/refs/heads/master /tmp/cache
RUN nix-env -iA cachix -f https://cachix.org/api/v1/install
RUN cachix use emacs-ci
RUN nix-env -iA emacs-29-1 -f https://github.com/purcell/nix-emacs-ci/archive/master.tar.gz
RUN nix --extra-experimental-features nix-command copy --no-require-sigs --to /nix-emacs $(type -p emacs)
RUN cd /nix-emacs/nix/store && ln -s *emacs* emacs

FROM alpine:3.14

RUN apk add --no-cache \
curl \
gnupg \
openssh-client

COPY --from=0 /nix-emacs/nix/store /nix/store
ENV PATH="/nix/store/emacs/bin:$PATH"

CMD ["emacs"]
3 changes: 3 additions & 0 deletions 29.1/alpine/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM silex/emacs:29.1-alpine

RUN apk add --no-cache git make
6 changes: 6 additions & 0 deletions 29.1/alpine/ci/cask/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM silex/emacs:29.1-alpine-ci

RUN apk add --no-cache python3

RUN git clone https://github.com/cask/cask /root/.cask
ENV PATH="/root/.cask/bin:$PATH"
4 changes: 4 additions & 0 deletions 29.1/alpine/ci/eldev/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM silex/emacs:29.1-alpine-ci

RUN curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh
ENV PATH="/root/.eldev/bin:$PATH"
4 changes: 4 additions & 0 deletions 29.1/alpine/ci/keg/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM silex/emacs:29.1-alpine-ci

RUN git clone https://github.com/conao3/keg.el.git /root/.keg
ENV PATH="/root/.keg/bin:$PATH"
22 changes: 22 additions & 0 deletions 29.1/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM nixos/nix

ADD https://api.github.com/repos/purcell/nix-emacs-ci/git/refs/heads/master /tmp/cache
RUN nix-env -iA cachix -f https://cachix.org/api/v1/install
RUN cachix use emacs-ci
RUN nix-env -iA emacs-29-1 -f https://github.com/purcell/nix-emacs-ci/archive/master.tar.gz
RUN nix --extra-experimental-features nix-command copy --no-require-sigs --to /nix-emacs $(type -p emacs)
RUN cd /nix-emacs/nix/store && ln -s *emacs* emacs

FROM debian

RUN apt-get update && \
apt-get install -y \
curl \
gnupg \
openssh-client \
&& rm -rf /var/lib/apt/lists/*

COPY --from=0 /nix-emacs/nix/store /nix/store
ENV PATH="/nix/store/emacs/bin:$PATH"

CMD ["emacs"]
5 changes: 5 additions & 0 deletions 29.1/debian/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM silex/emacs:29.1

RUN apt-get update && \
apt-get install -y git make && \
rm -rf /var/lib/apt/lists/*
8 changes: 8 additions & 0 deletions 29.1/debian/ci/cask/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM silex/emacs:29.1-ci

RUN apt-get update && \
apt-get install -y python3 && \
rm -rf /var/lib/apt/lists/*

RUN git clone https://github.com/cask/cask /root/.cask
ENV PATH="/root/.cask/bin:$PATH"
4 changes: 4 additions & 0 deletions 29.1/debian/ci/eldev/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM silex/emacs:29.1-ci

RUN curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh
ENV PATH="/root/.eldev/bin:$PATH"
4 changes: 4 additions & 0 deletions 29.1/debian/ci/keg/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM silex/emacs:29.1-ci

RUN git clone https://github.com/conao3/keg.el.git /root/.keg
ENV PATH="/root/.keg/bin:$PATH"
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,17 @@ Wraps [nix-emacs-ci](https://github.com/purcell/nix-emacs-ci) in docker images.
- [`master-alpine-ci-cask`](https://github.com/Silex/docker-emacs/blob/master/master/alpine/ci/cask/Dockerfile)
- [`master-alpine-ci-eldev`](https://github.com/Silex/docker-emacs/blob/master/master/alpine/ci/eldev/Dockerfile)
- [`master-alpine-ci-keg`](https://github.com/Silex/docker-emacs/blob/master/master/alpine/ci/keg/Dockerfile)
- [`28.2`, `28`, `latest`](https://github.com/Silex/docker-emacs/blob/master/28.2/debian/Dockerfile)
- [`29.1`, `29`, `latest`](https://github.com/Silex/docker-emacs/blob/master/29.1/debian/Dockerfile)
- [`29.1-ci`, `29-ci`, `ci`](https://github.com/Silex/docker-emacs/blob/master/29.1/debian/ci/Dockerfile)
- [`29.1-ci-cask`, `29-ci-cask`, `cask`](https://github.com/Silex/docker-emacs/blob/master/29.1/debian/ci/cask/Dockerfile)
- [`29.1-ci-eldev`, `29-ci-eldev`, `eldev`](https://github.com/Silex/docker-emacs/blob/master/29.1/debian/ci/eldev/Dockerfile)
- [`29.1-ci-keg`, `29-ci-keg`, `keg`](https://github.com/Silex/docker-emacs/blob/master/29.1/debian/ci/keg/Dockerfile)
- [`29.1-alpine`, `29-alpine`, `alpine`](https://github.com/Silex/docker-emacs/blob/master/29.1/alpine/Dockerfile)
- [`29.1-alpine-ci`, `29-alpine-ci`, `alpine-ci`](https://github.com/Silex/docker-emacs/blob/master/29.1/alpine/ci/Dockerfile)
- [`29.1-alpine-ci-cask`, `29-alpine-ci-cask`, `alpine-ci-cask`](https://github.com/Silex/docker-emacs/blob/master/29.1/alpine/ci/cask/Dockerfile)
- [`29.1-alpine-ci-eldev`, `29-alpine-ci-eldev`, `alpine-ci-eldev`](https://github.com/Silex/docker-emacs/blob/master/29.1/alpine/ci/eldev/Dockerfile)
- [`29.1-alpine-ci-keg`, `29-alpine-ci-keg`, `alpine-ci-keg`](https://github.com/Silex/docker-emacs/blob/master/29.1/alpine/ci/keg/Dockerfile)
- [`28.2`, `28`](https://github.com/Silex/docker-emacs/blob/master/28.2/debian/Dockerfile)
- [`28.2-ci`, `28-ci`, `ci`](https://github.com/Silex/docker-emacs/blob/master/28.2/debian/ci/Dockerfile)
- [`28.2-ci-cask`, `28-ci-cask`, `cask`](https://github.com/Silex/docker-emacs/blob/master/28.2/debian/ci/cask/Dockerfile)
- [`28.2-ci-eldev`, `28-ci-eldev`, `eldev`](https://github.com/Silex/docker-emacs/blob/master/28.2/debian/ci/eldev/Dockerfile)
Expand Down
42 changes: 41 additions & 1 deletion images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,47 @@
template: alpine/ci/keg
depends: master-alpine-ci

- tags: [28.2, 28, latest]
- tags: [29.1, 29, latest]
version: 29.1
template: debian
- tags: [29.1-ci, 29-ci, ci]
version: 29.1
template: debian/ci
depends: 29.1
- tags: [29.1-ci-cask, 29-ci-cask, cask]
version: 29.1
template: debian/ci/cask
depends: 29.1-ci
- tags: [29.1-ci-eldev, 29-ci-eldev, eldev]
version: 29.1
template: debian/ci/eldev
depends: 29.1-ci
- tags: [29.1-ci-keg, 29-ci-keg, keg]
version: 29.1
template: debian/ci/keg
depends: 29.1-ci

- tags: [29.1-alpine, 29-alpine, alpine]
version: 29.1
template: alpine
- tags: [29.1-alpine-ci, 29-alpine-ci, alpine-ci]
version: 29.1
template: alpine/ci
depends: 29.1-alpine
- tags: [29.1-alpine-ci-cask, 29-alpine-ci-cask, alpine-ci-cask]
version: 29.1
template: alpine/ci/cask
depends: 29.1-alpine-ci
- tags: [29.1-alpine-ci-eldev, 29-alpine-ci-eldev, alpine-ci-eldev]
version: 29.1
template: alpine/ci/eldev
depends: 29.1-alpine-ci
- tags: [29.1-alpine-ci-keg, 29-alpine-ci-keg, alpine-ci-keg]
version: 29.1
template: alpine/ci/keg
depends: 29.1-alpine-ci

- tags: [28.2, 28]
version: 28.2
template: debian
- tags: [28.2-ci, 28-ci, ci]
Expand Down

0 comments on commit 430afde

Please sign in to comment.