diff --git a/.github/workflows/ci-lint.yaml b/.github/workflows/ci-lint.yaml deleted file mode 100644 index 60e920c..0000000 --- a/.github/workflows/ci-lint.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: lint -on: - push: - branches: - - '**' - pull_request: - branches: - - '**' -jobs: - exec-lint: - runs-on: ubuntu-latest - container: - image: ghcr.io/thepigeongenerator/mcaselector-lite:latest - steps: - # TODO: add linting checking here - - run: echo "TODO" - diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml deleted file mode 100644 index 8d5bb00..0000000 --- a/.github/workflows/ci-tests.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: tests -on: - workflow_run: - workflows: - - bin - types: - - completed -jobs: - execute-tests: - runs-on: ubuntu-latest - container: - image: ghcr.io/thepigeongenerator/mcaselector-lite:latest - strategy: - matrix: - include: - - kernel: linux - march: x86_64 - cc: x86_64-linux-gnu-gcc - # WARN: not testing win-x86_64... Probably a good idea to do that - steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 - with: - name: ${{matrix.march}}-${{matrix.kernel}}-rel - path: obj/ - - name: execute tests for ${{matrix.march}}-${{matrix.kernel}} - run: make DEBUG=test run MARCH=${{matrix.march}} KERNEL=${{matrix.kernel}} CC=${{matrix.cc}} -j diff --git a/.github/workflows/ci-bin.yaml b/.github/workflows/ci.yaml similarity index 51% rename from .github/workflows/ci-bin.yaml rename to .github/workflows/ci.yaml index 93d5309..2ff62e8 100644 --- a/.github/workflows/ci-bin.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,4 @@ -name: bin +name: CI on: push: branches: @@ -28,3 +28,23 @@ jobs: with: name: ${{matrix.march}}-${{matrix.kernel}}-rel path: obj/ + test: + needs: compile + runs-on: ubuntu-latest + container: + image: ghcr.io/thepigeongenerator/mcaselector-lite:latest + strategy: + matrix: + include: + - kernel: linux + march: x86_64 + cc: x86_64-linux-gnu-gcc + # WARN: not testing win-x86_64... Probably a good idea to do that + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: ${{matrix.march}}-${{matrix.kernel}}-rel + path: obj/ + - name: execute tests for ${{matrix.march}}-${{matrix.kernel}} + run: make DEBUG=test run MARCH=${{matrix.march}} KERNEL=${{matrix.kernel}} CC=${{matrix.cc}} -j