Skip to content

Commit

Permalink
Drop test cases for non-latest images of each major version.
Browse files Browse the repository at this point in the history 
Unfortunately `silex/emacs` no longer supports them.

Silex/docker-emacs#62 (comment)

Silex/docker-emacs@ed73680
  • Loading branch information
@dochang
dochang committed Sep 14, 2021
1 parent 827e272 commit 7d1173c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 240 deletions.
23 changes: 5 additions & 18 deletions .drone.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ local linuxbrew_debian_cmds(cmds) = [

local test_step(emacs_ver) = {
name: 'test-emacs%s' % emacs_ver,
image: 'silex/emacs:%s-dev' % emacs_ver,
image: 'silex/emacs:%s-ci-cask' % emacs_ver,
commands: [
'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"',
'cask install',
Expand All @@ -30,7 +30,7 @@ local test_step(emacs_ver) = {
path: '/home/linuxbrew/.linuxbrew',
},
],
'environment': {
environment: {
TARGET_ROOT: '/tmp/elpa-clone/emacs%s' % emacs_ver,
},
depends_on: [
Expand All @@ -43,8 +43,8 @@ local generate_pipeline(args) = {
name: args.pipeline_name,
steps: [
{
# We have to generate `en_US.UTF-8` locale because brew sets `LC_ALL` to
# it.
// We have to generate `en_US.UTF-8` locale because brew sets `LC_ALL` to
// it.
name: 'install locales',
image: args.linuxbrew_image,
commands: args.locale_gen_cmds_func([
Expand Down Expand Up @@ -131,19 +131,6 @@ std.map(generate_pipeline, [
linuxbrew_image: 'buildpack-deps:stable',
locale_gen_cmds_func: locale_gen_cmds_default,
ci_deps_cmds_func: std.prune,
emacs_vers: ['24.5', '25.1', '25.2', '25.3', '26.1', '26.2', '26.3'],
},
{
# According to [1] and [2], Emacs 24.4 cannot be built on Ubuntu 18.04, so
# `silex/emacs:24.4` use Ubuntu 12.04 as its base image. We have to
# install dependencies on Ubuntu 12.04.
#
# [1]: https://github.com/Silex/docker-emacs/issues/34
# [2]: https://github.com/Silex/docker-emacs/commit/df66168dc4edc5a746351685b88ac59d3efcb183
pipeline_name: 'test for emacs 24.4',
linuxbrew_image: 'ubuntu:12.04',
locale_gen_cmds_func: locale_gen_cmds_ubuntu1204,
ci_deps_cmds_func: linuxbrew_debian_cmds,
emacs_vers: ['24.4'],
emacs_vers: ['24', '25', '26'],
},
])
231 changes: 9 additions & 222 deletions .drone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs24.5"
"TARGET_ROOT": "/tmp/elpa-clone/emacs24"
},
"image": "silex/emacs:24.5-dev",
"name": "test-emacs24.5",
"image": "silex/emacs:24-ci-cask",
"name": "test-emacs24",
"volumes": [
{
"name": "locales",
Expand All @@ -104,10 +104,10 @@
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs25.1"
"TARGET_ROOT": "/tmp/elpa-clone/emacs25"
},
"image": "silex/emacs:25.1-dev",
"name": "test-emacs25.1",
"image": "silex/emacs:25-ci-cask",
"name": "test-emacs25",
"volumes": [
{
"name": "locales",
Expand All @@ -129,223 +129,10 @@
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs25.2"
"TARGET_ROOT": "/tmp/elpa-clone/emacs26"
},
"image": "silex/emacs:25.2-dev",
"name": "test-emacs25.2",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
},
{
"commands": [
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"cask install",
"cask exec ert-runner"
],
"depends_on": [
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs25.3"
},
"image": "silex/emacs:25.3-dev",
"name": "test-emacs25.3",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
},
{
"commands": [
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"cask install",
"cask exec ert-runner"
],
"depends_on": [
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs26.1"
},
"image": "silex/emacs:26.1-dev",
"name": "test-emacs26.1",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
},
{
"commands": [
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"cask install",
"cask exec ert-runner"
],
"depends_on": [
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs26.2"
},
"image": "silex/emacs:26.2-dev",
"name": "test-emacs26.2",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
},
{
"commands": [
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"cask install",
"cask exec ert-runner"
],
"depends_on": [
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs26.3"
},
"image": "silex/emacs:26.3-dev",
"name": "test-emacs26.3",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
}
],
"volumes": [
{
"name": "cache",
"temp": { }
},
{
"name": "locales",
"temp": { }
},
{
"name": "linuxbrew",
"temp": { }
}
]
}
---
{
"kind": "pipeline",
"name": "test for emacs 24.4",
"steps": [
{
"commands": [
"apt-get update",
"apt-get install --yes locales",
"locale-gen en_US.UTF-8"
],
"image": "ubuntu:12.04",
"name": "install locales",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
}
]
},
{
"commands": [
"apt-get update",
"apt-get install --yes git",
"git clone https://github.com/Homebrew/brew /home/linuxbrew/.linuxbrew/Homebrew",
"mkdir -p /home/linuxbrew/.linuxbrew/bin",
"ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin"
],
"image": "ubuntu:12.04",
"name": "install Linuxbrew",
"volumes": [
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
}
]
},
{
"commands": [
"apt-get update",
"apt-get install --yes build-essential curl file git",
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"brew update",
"brew bundle"
],
"depends_on": [
"install locales",
"install Linuxbrew"
],
"environment": {
"HOMEBREW_DEVELOPER": 1,
"HOMEBREW_NO_ANALYTICS": 1,
"HOMEBREW_NO_AUTO_UPDATE": 1,
"HOMEBREW_NO_INSTALL_CLEANUP": 1
},
"image": "ubuntu:12.04",
"name": "install ci deps",
"volumes": [
{
"name": "locales",
"path": "/usr/lib/locale"
},
{
"name": "linuxbrew",
"path": "/home/linuxbrew/.linuxbrew"
},
{
"name": "cache",
"path": "/root/.cache"
}
]
},
{
"commands": [
"eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"",
"cask install",
"cask exec ert-runner"
],
"depends_on": [
"install ci deps"
],
"environment": {
"TARGET_ROOT": "/tmp/elpa-clone/emacs24.4"
},
"image": "silex/emacs:24.4-dev",
"name": "test-emacs24.4",
"image": "silex/emacs:26-ci-cask",
"name": "test-emacs26",
"volumes": [
{
"name": "locales",
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Removed

- Drop test cases for non-latest images of each major version

## [0.0.9] - 2019-10-06

### Added
Expand Down

0 comments on commit 7d1173c

Please sign in to comment.