From b035527c6d29ddcd06826c7d0cd908c8b920a9a4 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 8 Aug 2024 10:01:46 -0400 Subject: [PATCH] consolidate github workflows --- .github/workflows/arch.x86_64.asan.yml | 15 --------------- .github/workflows/arch.x86_64.yml | 22 +++++++++++++++------- 2 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 .github/workflows/arch.x86_64.asan.yml diff --git a/.github/workflows/arch.x86_64.asan.yml b/.github/workflows/arch.x86_64.asan.yml deleted file mode 100644 index f700f12..0000000 --- a/.github/workflows/arch.x86_64.asan.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: arch.x86_64.asan -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - - name: ci-test-asan - uses: falconindy/arch-dockerbuild@v1 - with: - entrypoint: 'build-aux/ci-test-asan' diff --git a/.github/workflows/arch.x86_64.yml b/.github/workflows/arch.x86_64.yml index 38e190a..1b41fe0 100644 --- a/.github/workflows/arch.x86_64.yml +++ b/.github/workflows/arch.x86_64.yml @@ -2,14 +2,22 @@ name: arch.x86_64 on: [push, pull_request] jobs: - build: - + test: runs-on: ubuntu-latest + container: + image: archlinux + steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 + - run: build-aux/ci-test + + test_asan: + runs-on: ubuntu-latest + + container: + image: archlinux - - name: ci-test - uses: falconindy/arch-dockerbuild@v1 - with: - entrypoint: 'build-aux/ci-test' + steps: + - uses: actions/checkout@v4 + - run: build-aux/ci-test-asan