Skip to content

Commit

Permalink
[chore, CI] Update to latest Docker images for ragel
Browse files Browse the repository at this point in the history
  • Loading branch information
Frenzie committed Jan 5, 2020
1 parent 53ff648 commit ee4d6c9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ workflows:
jobs:
lint:
docker:
- image: koreader/kobase:0.1.3
- image: koreader/kobase:0.1.5
environment:
BASH_ENV: "~/.bashrc"
steps:
Expand All @@ -68,7 +68,7 @@ jobs:
emu: &EMU_TPL
docker:
- image: koreader/kobase:0.1.3
- image: koreader/kobase:0.1.5
environment: &EMU_ENV_LST
BASH_ENV: "~/.bashrc"
EMULATE_READER: "1"
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
emu_clang_ninja:
<<: *EMU_TPL
docker:
- image: koreader/kobase-clang:0.1.3
- image: koreader/kobase-clang:0.1.4
environment:
<<: *EMU_ENV_LST
CC: "clang-9"
Expand Down Expand Up @@ -151,19 +151,19 @@ jobs:
<<: *XCOMPILE_TPL
environment:
TARGET: "kindle"
DOCKER_IMG: frenzie/kokindle:0.1.1
DOCKER_IMG: koreader/kokindle:0.1.2

kobo:
<<: *XCOMPILE_TPL
environment:
TARGET: "kobo"
DOCKER_IMG: frenzie/kokobo:0.1.1
DOCKER_IMG: koreader/kokobo:0.1.2

pocketbook:
<<: *XCOMPILE_TPL
environment:
TARGET: "pocketbook"
DOCKER_IMG: frenzie/kopb:0.1.2
DOCKER_IMG: koreader/kopb:0.1.3

sony-prstux:
<<: *XCOMPILE_TPL
Expand All @@ -175,17 +175,17 @@ jobs:
<<: *XCOMPILE_TPL
environment:
TARGET: "cervantes"
DOCKER_IMG: frenzie/kocervantes:0.1.1
DOCKER_IMG: koreader/kocervantes:0.1.2

android-arm: &ANDROID_TPL
<<: *XCOMPILE_TPL
environment:
TARGET: "android"
DOCKER_IMG: koreader/koandroid:0.3
DOCKER_IMG: koreader/koandroid:0.3.1

android-x86:
<<: *ANDROID_TPL
environment:
TARGET: "android"
ANDROID_ARCH: "x86"
DOCKER_IMG: koreader/koandroid:0.3
DOCKER_IMG: koreader/koandroid:0.3.1
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ env:
- EMULATE_READER=1 CC=gcc USE_MAKE=1
- EMULATE_READER=1 CC=gcc KODEBUG=1
- EMULATE_READER=1 CC=clang
- TARGET=kindle DOCKER_IMG=frenzie/kokindle:0.1.1
- TARGET=kobo DOCKER_IMG=frenzie/kokobo:0.1.1
- TARGET=pocketbook DOCKER_IMG=frenzie/kopb:0.1.2
- TARGET=kindle DOCKER_IMG=koreader/kokindle:0.1.2
- TARGET=kobo DOCKER_IMG=koreader/kokobo:0.1.2
- TARGET=pocketbook DOCKER_IMG=koreader/kopb:0.1.3
- TARGET=sony-prstux DOCKER_IMG=phreakuencies/prstux-dev:16.04
- TARGET=cervantes DOCKER_IMG=frenzie/kocervantes:0.1.1
- TARGET=android DOCKER_IMG=koreader/koandroid:0.3
- TARGET=android DOCKER_IMG=koreader/koandroid:0.3 ANDROID_ARCH=x86
- TARGET=cervantes DOCKER_IMG=koreader/kocervantes:0.1.2
- TARGET=android DOCKER_IMG=koreader/koandroid:0.3.1
- TARGET=android DOCKER_IMG=koreader/koandroid:0.3.1 ANDROID_ARCH=x86

addons:
apt:
Expand Down

0 comments on commit ee4d6c9

Please sign in to comment.