From 365b65f21f881aae4dcfa5f21cf9313dfd504dba Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 9 Dec 2020 18:21:47 -0500 Subject: [PATCH] Merging Bionic and Xenial tests --- .../{test-bionic.yml => test-all-Ubuntu.yml} | 14 ++++++++++- .github/workflows/test-xenial.yml | 24 ------------------- 2 files changed, 13 insertions(+), 25 deletions(-) rename .github/workflows/{test-bionic.yml => test-all-Ubuntu.yml} (59%) delete mode 100644 .github/workflows/test-xenial.yml diff --git a/.github/workflows/test-bionic.yml b/.github/workflows/test-all-Ubuntu.yml similarity index 59% rename from .github/workflows/test-bionic.yml rename to .github/workflows/test-all-Ubuntu.yml index e3d8a4f58..a69cb6623 100644 --- a/.github/workflows/test-bionic.yml +++ b/.github/workflows/test-all-Ubuntu.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: jobs: - test-xenial: + test-bionic: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -22,3 +22,15 @@ jobs: - run: sudo composer install - run: sudo bash ./.github/scripts/python-pkg-install.sh - run: sudo bash ./.github/scripts/python-pkg-test.sh + test-xenial: + runs-on: ubuntu-16.04 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.5' + - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime + - run: sudo bash ./.github/scripts/install.sh + - run: sudo composer install + - run: sudo bash ./.github/scripts/python-pkg-install.sh + - run: sudo bash ./.github/scripts/python-pkg-test.sh diff --git a/.github/workflows/test-xenial.yml b/.github/workflows/test-xenial.yml deleted file mode 100644 index d7e564e21..000000000 --- a/.github/workflows/test-xenial.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: test-xenial -on: - push: - paths-ignore: - - 'docs/**' - pull_request: - types: [opened, ready_for_review, review_requested] - paths-ignore: - - 'docs/**' - workflow_dispatch: - -jobs: - test-xenial: - runs-on: ubuntu-16.04 - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: '3.5' - - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime - - run: sudo bash ./.github/scripts/install.sh - - run: sudo composer install - - run: sudo bash ./.github/scripts/python-pkg-install.sh - - run: sudo bash ./.github/scripts/python-pkg-test.sh