From fbbf22d2e8817d84218c2870463274075bd76bef Mon Sep 17 00:00:00 2001 From: Jochen Ulrich Date: Wed, 10 Nov 2021 22:58:07 +0100 Subject: [PATCH 1/2] ci: Add CI workflow --- .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++ .travis.yml | 23 ----------------------- CHANGELOG.md | 1 - tests/Dockerfile | 5 ----- 4 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml delete mode 100644 tests/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d560187 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: CI + +on: [ push, pull_request, workflow_dispatch ] + +jobs: + build and test: + name: Build & Test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Build and run tests + run: > + docker run --rm + -v "${GITHUB_WORKSPACE}:/workspace" + julrich/docker_qt:latest + /bin/bash -c " + cd /workspace + && g++ --version + && qmake --version + && cd tests + && mkdir _build + && cd _build + && cmake -DCMAKE_BUILD_TYPE=Release .. + && make all + && ctest --ouput-on-failure + " \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ed6f731..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -sudo: required - -language: cpp - -services: - - docker - -before_script: - - cd tests - - docker build -t j-ulrich/http-status-codes -f Dockerfile .. - -script: - - > - docker run j-ulrich/http-status-codes /bin/bash -c " - g++ --version - && qmake --version - && cd tests - && mkdir _build - && cd _build - && cmake -DCMAKE_BUILD_TYPE=Release .. - && make all - && ctest --ouput-on-failure - " \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fdb0f5..a8d522b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,6 @@ Updates and adds missing status codes from the IANA registry. - {C++11} Added missing `Code::xxx_max` enumerator. - --- diff --git a/tests/Dockerfile b/tests/Dockerfile deleted file mode 100644 index 878dfba..0000000 --- a/tests/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM julrich/docker_qt:latest - -RUN mkdir /build -COPY . /build -WORKDIR /build From 610fc939584916f18540f72b2daeeb6e76250d90 Mon Sep 17 00:00:00 2001 From: Jochen Ulrich Date: Wed, 10 Nov 2021 23:02:30 +0100 Subject: [PATCH 2/2] ci: Fix job identifier --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d560187..22354e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: [ push, pull_request, workflow_dispatch ] jobs: - build and test: + build_and_test: name: Build & Test runs-on: ubuntu-latest steps: