Move test workflow into Linux workflow and delete the original file.

This commit is contained in:
Zachary Hall 2023-11-17 14:18:00 -08:00
parent 33f496efbe
commit 8f5f645564
2 changed files with 24 additions and 33 deletions

View file

@ -1,4 +1,4 @@
name: Build for Linux name: Linux workflow
on: on:
push: push:
@ -8,7 +8,7 @@ on:
jobs: jobs:
build: build:
name: Build for Linux
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -24,3 +24,25 @@ jobs:
with: with:
name: linux name: linux
path: builddir/b16converter path: builddir/b16converter
test:
name: Test on Linux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt update -y && sudo apt install meson build-essential libmagick++-dev -y
- name: Download executable
uses: actions/download-artifact@v2.1.1
with:
name: linux
path: b16convert
- name: Set up build directory
run: meson setup builddir
- name: Run test script
run: ./test.sh -p b16convert
- name: Upload test artifacts
uses: actions/upload-artifact@v3.1.3
with:
name: test-files
path: testout

View file

@ -1,31 +0,0 @@
name: Test on Linux
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt update -y && sudo apt install meson build-essential libmagick++-dev -y
- name: Download executable
uses: actions/download-artifact@v2.1.1
with:
name: linux
path: b16convert
- name: Set up build directory
run: meson setup builddir
- name: Run test script
run: ./test.sh -p b16convert
- name: Upload test artifacts
uses: actions/upload-artifact@v3.1.3
with:
name: test-files
path: testout