From bd48181005ef3bc6611c801b1be70609d8d69965 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 21 May 2021 10:20:15 +0100 Subject: Only run CI build on master --- .github/workflows/main.yml | 23 +++++++++++++++++++++++ build/.github/workflows/main.yml | 19 ------------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 build/.github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..76f8995 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,23 @@ +name: Build and Test + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build_and_test: + runs-on: ubuntu-latest + + strategy: + matrix: + distro: + - fedora + - debian-stretch + fail-fast: false + + steps: + - uses: actions/checkout@v2 + - run: docker build -t libgusb-${{ matrix.distro }} -f contrib/ci/Dockerfile-${{ matrix.distro }} . + - run: docker run -t -v `pwd`:/build libgusb-${{ matrix.distro }} ./contrib/ci/build_and_test.sh -Dtests=false diff --git a/build/.github/workflows/main.yml b/build/.github/workflows/main.yml deleted file mode 100644 index 1cd1f88..0000000 --- a/build/.github/workflows/main.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Build and Test - -on: [push, pull_request] - -jobs: - build_and_test: - runs-on: ubuntu-latest - - strategy: - matrix: - distro: - - fedora - - debian-stretch - fail-fast: false - - steps: - - uses: actions/checkout@v2 - - run: docker build -t libgusb-${{ matrix.distro }} -f contrib/ci/Dockerfile-${{ matrix.distro }} . - - run: docker run -t -v `pwd`:/build libgusb-${{ matrix.distro }} ./contrib/ci/build_and_test.sh -Dtests=false -- cgit v1.2.1