From ac590912bc61eb1d793ab6b8412f4d17e1e1e902 Mon Sep 17 00:00:00 2001
From: EnderIce2 <enderice2@users.noreply.github.com>
Date: Mon, 13 May 2024 05:39:15 +0300
Subject: [PATCH] Merge GitHub workflows

---
 .../{mkdocs.yml => build-deploy.yml}          | 21 +++++++++++++---
 .github/workflows/c-cpp.yml                   | 24 -------------------
 2 files changed, 18 insertions(+), 27 deletions(-)
 rename .github/workflows/{mkdocs.yml => build-deploy.yml} (63%)
 delete mode 100644 .github/workflows/c-cpp.yml

diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/build-deploy.yml
similarity index 63%
rename from .github/workflows/mkdocs.yml
rename to .github/workflows/build-deploy.yml
index fb10bd5..2a52bcb 100644
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/build-deploy.yml
@@ -1,14 +1,29 @@
-name: mkdocs
+name: Build and Deploy docs
 
 on:
   push:
-    branches:
-      - master
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 permissions:
   contents: write
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: dependencies
+      run: sudo apt-get update && sudo apt-get install gcc-mingw-w64 make
+    - name: make
+      run: make
+    - name: artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: bridge
+        path: build
+
   deploy:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
deleted file mode 100644
index 567ac46..0000000
--- a/.github/workflows/c-cpp.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: C/C++ CI
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: dependencies
-      run: sudo apt-get update && sudo apt-get install gcc-mingw-w64 make
-    - name: make
-      run: make
-    - name: artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: bridge
-        path: build