From c9799e12775784557a247c15bf77b9bee00ba93a Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 14:38:02 -0700 Subject: [PATCH 1/7] Initial GitHub action. --- .github/workflows/build-and-test.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/build-and-test.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 index 0000000..fd278bf --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,22 @@ +name: Build and Test + +on: push + +jobs: + build: + name: Build + runs-on: [ubuntu-latest, macos-latest, windows-latest] + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Install + run: | + python -m pip intstall --upgrade pip + python -m pip install pipenv + pipenv install --dev + - name: Test + run: | + pipenv run pytest -v + From 1c9b350901656ad136abc4015cb8115042d991ac Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 14:42:12 -0700 Subject: [PATCH 2/7] Add matrix for runner. --- .github/workflows/build-and-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fd278bf..fa2c371 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -5,7 +5,10 @@ on: push jobs: build: name: Build - runs-on: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 From 2588dd017488eb62dd16c1f308bf476b3df57b5c Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 14:45:25 -0700 Subject: [PATCH 3/7] Fix typo. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fa2c371..f3b0824 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -16,7 +16,7 @@ jobs: python-version: 3.7 - name: Install run: | - python -m pip intstall --upgrade pip + python -m pip install --upgrade pip python -m pip install pipenv pipenv install --dev - name: Test From 497e35e637efe26a4aebbf71db286a7ac46d6ede Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 14:51:40 -0700 Subject: [PATCH 4/7] Add submodules. --- .github/workflows/build-and-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f3b0824..5c51381 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,6 +11,8 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 + with: + submodules: true - uses: actions/setup-python@v1 with: python-version: 3.7 From 4d5a4863a67f3b3e3804a6b6188a6bae2d6d2a05 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 15:12:30 -0700 Subject: [PATCH 5/7] Breakout commands. --- .github/workflows/build-and-test.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5c51381..a4f7b3c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -10,16 +10,22 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - name: Checkout + uses: actions/checkout@v1 with: submodules: true - - uses: actions/setup-python@v1 + - name: Setup python + uses: actions/setup-python@v1 with: python-version: 3.7 - - name: Install + - name: Upgrade pip run: | python -m pip install --upgrade pip + - name: Install pipenv + run: | python -m pip install pipenv + - name: Install project + run: | pipenv install --dev - name: Test run: | From 220455b78c20897de6b227e4ff6a1071ad2ba956 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Fri, 6 Dec 2019 15:20:54 -0700 Subject: [PATCH 6/7] Clean up yaml. --- .github/workflows/build-and-test.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a4f7b3c..94a4329 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,15 +19,11 @@ jobs: with: python-version: 3.7 - name: Upgrade pip - run: | - python -m pip install --upgrade pip + run: python -m pip install --upgrade pip - name: Install pipenv - run: | - python -m pip install pipenv + run: python -m pip install pipenv - name: Install project - run: | - pipenv install --dev + run: pipenv install --dev - name: Test - run: | - pipenv run pytest -v + run: pipenv run pytest -v From 7eaece52b9d46bc33d3cef5f8bf641e37b54215c Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Wed, 27 May 2020 12:27:19 -0600 Subject: [PATCH 7/7] Update GitHub actions. --- .github/workflows/build-and-test.yml | 2 ++ .travis.yml | 41 ---------------------------- README.md | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 94a4329..2acdc1e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,4 +26,6 @@ jobs: run: pipenv install --dev - name: Test run: pipenv run pytest -v + - name: Generate web content + run: pipenv run python web/web-content.py diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9a943d5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ - -matrix: - include: - - os: osx - osx_image: xcode10.1 - language: sh - env: - - TOXENV=py3 - - HOMEBREW_NO_INSTALL_CLEANUP=1 - - HOMEBREW_NO_ANALYTICS=1 - before_cache: - # - brew cleanup - - rm -f "$HOME/Library/Caches/pip/log/debug.log" - cache: - directories: - # - "$HOME/Library/Caches/Homebrew" - - "$HOME/Library/Caches/pip" - addons: - homebrew: - # update: true - packages: python3 - before_install: - - python3 -m pip install pipenv - - os: linux - language: python - python: "3.7" - dist: xenial - - os: windows - language: sh - python: "3.7" - before_install: - - choco install python3 --params "/InstallDir:C:\\Python" - - export PATH="/c/Python:/c/Python/Scripts:$PATH" - - python -m pip install pipenv - -install: - - pipenv install --dev - -script: -- pipenv run pytest -v -- pipenv run python web/web-content.py \ No newline at end of file diff --git a/README.md b/README.md index 7c0d185..d55e067 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/open205/toolkit-205.svg?branch=develop)](https://travis-ci.org/open205/toolkit-205) +[![Build and Test](https://github.com/open205/toolkit-205/workflows/Build%20and%20Test/badge.svg)](https://github.com/open205/toolkit-205/actions?query=workflow%3A%22Build+and+Test%22) Toolkit 205 ===========