From 34940a6240b94c95ba5b4c4588b49206aab46ca0 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Sun, 22 Nov 2020 15:36:57 -0600 Subject: [PATCH 1/2] Migrate from Travis-CI to GitHub Actions --- .github/workflows/schedule.yml | 20 ++++++++++++++++++++ .github/workflows/test.yml | 16 ++++++++++++++++ .travis.yml | 8 -------- 3 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/schedule.yml create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml new file mode 100644 index 0000000..6f1e267 --- /dev/null +++ b/.github/workflows/schedule.yml @@ -0,0 +1,20 @@ +--- +name: Scheduled Site Tests +on: # yamllint disable-line rule:truthy + schedule: + - cron: "0 0 1 * *" # Monthly +jobs: + Tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: gh-pages + - run: >- + docker create -t + --name yadm-website + --entrypoint test/validate + yadm/jekyll:2019-10-17; + docker cp ./ yadm-website:/srv/jekyll + - name: Test Site + run: docker start yadm-website -a diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..a52682a --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,16 @@ +--- +name: Tests +on: # yamllint disable-line rule:truthy + - push + - pull_request + - workflow_dispatch +jobs: + Tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Tests + run: >- + docker run -t --rm + -v "$PWD:/yadm:ro" + yadm/testbed:2020-07-08 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5683e96..0000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -language: minimal -services: - - docker -before_install: - - docker pull yadm/testbed:2020-07-08 -script: - - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2020-07-08 From 3ddea208535be182af8cb53095d237bce55267f8 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Sun, 22 Nov 2020 16:39:37 -0600 Subject: [PATCH 2/2] Update badges/links for GitHub Actions --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 17ecc78..a5aa5cf 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ [![Master Update][master-date]][master-commits] [![Develop Update][develop-date]][develop-commits] [![Website Update][website-date]][website-commits]
-[![Master Status][master-badge]][travis-ci] -[![Develop Status][develop-badge]][travis-ci] -[![GH Pages Status][gh-pages-badge]][travis-ci] -[![Dev Pages Status][dev-pages-badge]][travis-ci] +[![Master Status][master-badge]][workflow-master] +[![Develop Status][develop-badge]][workflow-develop] +[![GH Pages Status][gh-pages-badge]][workflow-gh-pages] +[![Dev Pages Status][dev-pages-badge]][workflow-dev-pages] [https://yadm.io/][website-link] @@ -29,17 +29,17 @@ Features, usage, examples and installation instructions can be found on the [GnuPG]: https://gnupg.org/ [aur-badge]: https://img.shields.io/aur/version/yadm-git.svg [aur-link]: https://aur.archlinux.org/packages/yadm-git -[dev-pages-badge]: https://img.shields.io/travis/com/TheLocehiliosan/yadm/dev-pages.svg?label=dev-pages -[develop-badge]: https://img.shields.io/travis/com/TheLocehiliosan/yadm/develop.svg?label=develop +[dev-pages-badge]: https://img.shields.io/github/workflow/status/TheLocehiliosan/yadm/Test%20Site/dev-pages?label=dev-pages +[develop-badge]: https://img.shields.io/github/workflow/status/TheLocehiliosan/yadm/Tests/develop?label=develop [develop-commits]: https://github.com/TheLocehiliosan/yadm/commits/develop [develop-date]: https://img.shields.io/github/last-commit/TheLocehiliosan/yadm/develop.svg?label=develop [dotfiles]: https://en.wikipedia.org/wiki/Hidden_file_and_hidden_directory -[gh-pages-badge]: https://img.shields.io/travis/com/TheLocehiliosan/yadm/gh-pages.svg?label=gh-pages +[gh-pages-badge]: https://img.shields.io/github/workflow/status/TheLocehiliosan/yadm/Test%20Site/gh-pages?label=gh-pages [homebrew-badge]: https://img.shields.io/homebrew/v/yadm.svg [homebrew-link]: https://formulae.brew.sh/formula/yadm [license-badge]: https://img.shields.io/github/license/TheLocehiliosan/yadm.svg [license-link]: https://github.com/TheLocehiliosan/yadm/blob/master/LICENSE -[master-badge]: https://img.shields.io/travis/com/TheLocehiliosan/yadm/master.svg?label=master +[master-badge]: https://img.shields.io/github/workflow/status/TheLocehiliosan/yadm/Tests/master?label=master [master-commits]: https://github.com/TheLocehiliosan/yadm/commits/master [master-date]: https://img.shields.io/github/last-commit/TheLocehiliosan/yadm/master.svg?label=master [obs-badge]: https://img.shields.io/badge/OBS-v2.5.0-blue @@ -50,3 +50,7 @@ Features, usage, examples and installation instructions can be found on the [website-commits]: https://github.com/TheLocehiliosan/yadm/commits/gh-pages [website-date]: https://img.shields.io/github/last-commit/TheLocehiliosan/yadm/gh-pages.svg?label=website [website-link]: https://yadm.io/ +[workflow-dev-pages]: https://github.com/thelocehiliosan/yadm/actions?query=workflow%3a%22test+site%22+branch%3adev-pages +[workflow-develop]: https://github.com/TheLocehiliosan/yadm/actions?query=workflow%3ATests+branch%3Adevelop +[workflow-gh-pages]: https://github.com/thelocehiliosan/yadm/actions?query=workflow%3a%22test+site%22+branch%3agh-pages +[workflow-master]: https://github.com/TheLocehiliosan/yadm/actions?query=workflow%3ATests+branch%3Amaster