Merge CI and docker workflows
This commit is contained in:
parent
2d7dea438f
commit
73c1e142b6
3 changed files with 11 additions and 19 deletions
13
.github/workflows/ci.yml
vendored
13
.github/workflows/ci.yml
vendored
|
@ -3,10 +3,19 @@ name: CI
|
|||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
docker:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
- name: Build image
|
||||
run: docker build . --tag ${GITHUB_REPOSITORY,,}
|
||||
|
||||
- name: Show image info
|
||||
run: docker images
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
|
|
16
.github/workflows/docker.yml
vendored
16
.github/workflows/docker.yml
vendored
|
@ -1,16 +0,0 @@
|
|||
name: Docker
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
- name: Build image
|
||||
run: docker build .
|
||||
|
||||
- name: Show image info
|
||||
run: docker images
|
|
@ -2,6 +2,5 @@
|
|||
|
||||

|
||||

|
||||

|
||||
|
||||
Another website, really?
|
||||
|
|
Reference in a new issue