From 33fd97e19a12535c02b1cf6804cb854a279e040c Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 23 May 2021 14:30:07 +0200
Subject: Cleanup, linting, formatting

---
 .github/workflows/build.yml | 33 -------------------------------
 .github/workflows/main.yml  | 47 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 33 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/main.yml

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index cb9660e..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Project build and test
-
-on: push
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install
-        run: sudo apt-get update && sudo apt-get install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo ccache curl nasm grub-common qemu qemu-kvm mtools ctags inkscape
-      - name: Get cross compiler
-        id: cache-cross
-        uses: actions/cache@v1
-        with:
-          path: cross
-          key: toolchain
-      - name: Build cross compiler
-        if: steps.cache-cross.outputs.cache-hit != 'true'
-        run: sh run cross -y
-      - name: Build
-        run: MELVIX_CONFIG=release sh run build -y
-      - name: Upload as artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: disk-img
-          path: build/disk.img
-      - name: Test with release mode
-        run: MELVIX_CONFIG=release sh run test -y
-      - name: Test with debug mode
-        run: MELVIX_CONFIG=debug sh run test -y
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..3984c6e
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,47 @@
+name: lint, build, test, release
+
+on: push
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install
+        run: sudo apt-get update && sudo apt-get install -y build-essential ctags ccache clang-tidy-11 clang-format-11
+      - name: Generate linting instructions
+        run: sh run sync
+      - name: Lint
+        run: sh run lint
+
+  build-test-release:
+    needs: [lint]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install
+        run: sudo apt-get update && sudo apt-get install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo ccache curl nasm grub-common qemu qemu-kvm mtools ctags inkscape
+      - name: Get cross compiler
+        id: cache-cross
+        uses: actions/cache@v1
+        with:
+          path: cross
+          key: cached-toolchain
+      - name: Build cross compiler
+        if: steps.cache-cross.outputs.cache-hit != 'true'
+        run: sh run cross -y
+      - name: Build
+        run: MELVIX_CONFIG=release sh run build -y
+      - name: Upload as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: disk-img
+          path: build/disk.img
+      - name: Test with release mode
+        run: MELVIX_CONFIG=release sh run test -y
+      - name: Test with debug mode
+        run: MELVIX_CONFIG=debug sh run test -y
-- 
cgit v1.2.3