summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Morozenkov <o.morozenkov@corp.mail.ru>2021-12-04 12:13:54 +0100
committerOleg Morozenkov <o.morozenkov@corp.mail.ru>2021-12-04 12:13:54 +0100
commit0d32c60639f49492b840f6864f4785426b9d93e9 (patch)
treea79a7791528185d3f8dbe64d8e28fb45104130e8
parenta505f8ed49117c548b15dfd7c6c488be48b8d682 (diff)
Update docker-image.yml
-rw-r--r--.github/workflows/docker-image.yml10
-rw-r--r--.travis.yml10
2 files changed, 6 insertions, 14 deletions
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 7f786fc..6e51f1e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -7,12 +7,14 @@ on:
branches: [ master ]
jobs:
-
build:
-
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - name: Build the Docker image
- run: docker build . --file Dockerfile --tag tgbot-cpp:$(date +%s)
+ - name: Build the docker image
+ run: docker build -t reo7sp/tgbot-cpp -f Dockerfile .
+ - name: Build the docker image with unit tests
+ run: docker build -t reo7sp/tgbot-cpp-test -f Dockerfile_test .
+ - name: Run unit tests
+ run: docker run --rm reo7sp/tgbot-cpp-test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 37629fb..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo: required
-
-services:
- - docker
-
-script:
- - docker build -t reo7sp/tgbot-cpp -f Dockerfile .
- - docker build -t reo7sp/tgbot-cpp-test -f Dockerfile_test .
- - docker run --rm reo7sp/tgbot-cpp-test
-