Markus Hofbauer 6 年 前
コミット
40b4f96dd8
3 ファイル変更19 行追加20 行削除
  1. 17 5
      .github/workflows/ci.yml
  2. 0 13
      .github/workflows/docker.yml
  3. 2 2
      README.md

+ 17 - 5
.github/workflows/check.yml → .github/workflows/ci.yml

@@ -1,12 +1,10 @@
-name: Check
+name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
-  build:
-
+  check:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.8
@@ -20,3 +18,17 @@ jobs:
     - name: Check code format
       run: |
         make check_format
+
+  super-lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Lint Code Base
+      uses: docker://github/super-linter:v2.1.0
+
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Docker Build
+      run: docker build . --tag tcgui:$(date +%s)

+ 0 - 13
.github/workflows/docker.yml

@@ -1,13 +0,0 @@
-name: Docker
-on: [push]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Docker Build
-      run: docker build . --tag tcgui:$(date +%s)

+ 2 - 2
README.md

@@ -1,7 +1,6 @@
 # tcgui
 
-[![Actions Status](https://github.com/tum-lkn/tcgui/workflows/Check/badge.svg)](https://github.com/tum-lkn/tcgui)
-[![Actions Status](https://github.com/tum-lkn/tcgui/workflows/Docker/badge.svg)](https://github.com/tum-lkn/tcgui)
+[![Actions Status](https://github.com/tum-lkn/tcgui/workflows/CI/badge.svg)](https://github.com/tum-lkn/tcgui)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 A lightweight Python-based Web-GUI for Linux traffic control (`tc`) to set, view and delete traffic shaping rules. The Web-GUI is intended for short-term isolated testbeds or classroom scenarios and does not contain any security mechanisms.
@@ -16,6 +15,7 @@ No further changes are planned right now, but pull requests are welcome.
 - `netem` tools & `python3-flask` are required
     - Ubuntu 16.04 : Install with `sudo apt install iproute python3-flask`
     - Ubuntu 18.04 : Install with `sudo apt install iproute2 python3-flask`
+    - Ubuntu 20.04 : Install with `sudo apt install iproute2 python3-flask`
 - More information:
     - https://calomel.org/network_loss_emulation.html
     - https://wiki.linuxfoundation.org/networking/netem