Skip to content

Commit

Permalink
ci: Add workflow for developing container (#231)
Browse files Browse the repository at this point in the history
* ci: Add workflow for developing container
* ci: Add CI tasks to Makefile
* chore: Add RUNNER_TEMP to Dockerfile
* deps: Bump git from 2.25.0 to 2.26.0
  • Loading branch information
peaceiris authored Mar 27, 2020
1 parent e470a76 commit b71ad2d
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 6 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/dev-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: 'Dev Image CI'

on:
push:
branches:
- master
paths:
- '.github/workflows/dev-image.yml'
- '.dockerignore'
- '.nvmrc'
- 'Dockerfile'
- 'Makefile'
pull_request:
types:
- opened
- synchronize
paths:
- '.github/workflows/dev-image.yml'
- '.dockerignore'
- '.nvmrc'
- 'Dockerfile'
- 'Makefile'

jobs:
skipci:
runs-on: ubuntu-18.04
steps:
- run: echo "[skip ci] ${{ contains(github.event.head_commit.message, '[skip ci]') }}"

dev-image-test:
runs-on: ubuntu-18.04
if: contains(github.event.head_commit.message, '[skip ci]') == false
steps:
- uses: actions/checkout@v2
- run: make build
- run: make cirun cmd="npm ci"
- run: make ciall
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*

WORKDIR /git
ENV GIT_VERSION="2.25.0"
ENV GIT_VERSION="2.26.0"
RUN wget -q "https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz" && \
tar -zxf "./v${GIT_VERSION}.tar.gz" && \
rm "./v${GIT_VERSION}.tar.gz" && \
Expand All @@ -24,5 +24,6 @@ RUN wget -q "https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz" && \
make install

WORKDIR /repo
ENV RUNNER_TEMP="/tmp"

CMD [ "bash" ]
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ IMAGE_NAME := actions_hugo_dev:latest
NODE_VERSION := $(shell cat ./.nvmrc)
DOCKER_BUILD := docker build . -t $(IMAGE_NAME) --build-arg NODE_VERSION=$(NODE_VERSION)
DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/root/.gitconfig $(IMAGE_NAME)
DOCKER_RUN_CI := docker run --rm -v ${PWD}:/repo $(IMAGE_NAME)


.PHONY: build
Expand All @@ -14,10 +15,18 @@ build:
run:
$(DOCKER_RUN) $(cmd)

.PHONY: cirun
cirun:
$(DOCKER_RUN_CI) $(cmd)

.PHONY: test
test:
$(DOCKER_RUN) npm test

.PHONY: commit
commit:
$(DOCKER_RUN) git commit -m "$(msg)"
.PHONY: all
all:
$(DOCKER_RUN) npm run all

.PHONY: ciall
ciall:
$(DOCKER_RUN_CI) npm run all
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"npm": ">=6.13.7"
},
"scripts": {
"all": "npm run format:check && npm run lint && npm test",
"lint": "eslint ./{src,__tests__}/**/*.ts",
"lint:fix": "eslint --fix ./{src,__tests__}/**/*.ts",
"test": "jest --coverage --verbose",
Expand All @@ -28,8 +29,7 @@
"lint-staged": {
"src/**/*.ts": [
"prettier --check",
"eslint",
"jest --bail --findRelatedTests"
"eslint"
]
},
"repository": {
Expand Down

0 comments on commit b71ad2d

Please sign in to comment.