update ci

bytedance · Mar 20, 2024 · cfc13b0 · cfc13b0
1 parent 7c66f4c
commit cfc13b0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/.github/workflows/Elkeid_driver_build.yml b/.github/workflows/Elkeid_driver_build.yml
@@ -12,7 +12,7 @@ on:
     - driver/dockerfiles.aarch64/**
     - driver/dockerfiles.x86_64/**
   schedule:
-  - cron : 0 3 1 * *
+  - cron: 0 3 1 * *
 jobs:
   build_aliyun_linux2_x86_64:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/Elkeid_driver_release.yml b/.github/workflows/Elkeid_driver_release.yml
@@ -2584,23 +2584,20 @@ jobs:
         prerelease: false
         release_name: Release ${{github.ref}}
         tag_name: ${{github.ref}}
+    - name: Setup Version
+      run: echo "KMOD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F
+        '"' '{print $2}')" >> "$GITHUB_ENV"
     - uses: actions/download-artifact@v3
       with:
         path: ~/all_elkeid_drivers
     - name: Prepare artifact 1 mkdir
       run: mkdir -p elkeid_driver/ko elkeid_driver/log
     - name: Prepare artifact 2-1 ko
-      run: BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F " {print
-        $2}) mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.ko elkeid_driver/ko ||
-        true
+      run: mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.ko elkeid_driver/ko || true
     - name: Prepare artifact 2-2 sign
-      run: BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F " {print
-        $2}) mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.sign elkeid_driver/ko
-        || true
+      run: mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.sign elkeid_driver/ko || true
     - name: Prepare artifact 2-3 log
-      run: BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F " {print
-        $2}) mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.log elkeid_driver/log
-        || true
+      run: mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.log elkeid_driver/log || true
     - name: Pack artifact
       run: tar -C elkeid_driver -cJf elkeid_driver_ko.tar.xz ko
     - name: Pack log
@@ -2615,7 +2612,7 @@ jobs:
         asset_name: elkeid_driver_log.zip
         asset_path: ./elkeid_driver_log.zip
         upload_url: ${{steps.create_release.outputs.upload_url}}
-    - name: Upload Release Asset 
+    - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
       env:

diff --git a/driver/build_script/gen_ci_from_dockerfiles.py b/driver/build_script/gen_ci_from_dockerfiles.py
@@ -25,12 +25,12 @@ def gen_job(vminfo):
     some_data = OrderedDict(
         {
             "runs-on": runs_on,
-            "continue-on-error": "true",
+            "continue-on-error": True,
             "steps": [
                 OrderedDict({
                     "uses": "actions/checkout@v3",
                     "with": {
-                        "submodules": "false"
+                        "submodules": False
                     }
                 }),
                 OrderedDict({
@@ -55,7 +55,7 @@ def gen_job(vminfo):
                 OrderedDict({
                     "name": "Build "+vmname,
                     "uses": "docker/build-push-action@v3",
-                    "timeout-minutes": "300",
+                    "timeout-minutes": 420,
                     "with": {
                         "context": ".",
                         "file": dockerpath + "/Dockerfile."+vmname,
@@ -118,19 +118,19 @@ def gen_job(vminfo):
         "on": {
             "push": {
                 "paths":[
-                    "'.github/workflows/Elkeid_driver_build.yml'",
-                    "'.github/workflows/Elkeid_driver_release.yml'",
-                    "'driver/LKM/**'",
-                    "'driver/build_script/aarch64/**'",
-                    "'driver/build_script/x86_64/**'",
-                    "'driver/dockerfiles.aarch64/**'",
-                    "'driver/dockerfiles.x86_64/**'",
+                    ".github/workflows/Elkeid_driver_build.yml",
+                    ".github/workflows/Elkeid_driver_release.yml",
+                    "driver/LKM/**",
+                    "driver/build_script/aarch64/**",
+                    "driver/build_script/x86_64/**",
+                    "driver/dockerfiles.aarch64/**",
+                    "driver/dockerfiles.x86_64/**",
                 ],
                 "branches": [
                     "main",
                 ]
             },
-            "schedule": ["cron : '0 3 1 * *'"]
+            "schedule": [{"cron":"0 3 1 * *"}]
         }
     }
 )
@@ -141,7 +141,7 @@ def gen_job(vminfo):
         "on": {
             "push": {
                 "tags": [
-                    "'v*'"
+                    "v*"
                 ]
             },
         }
@@ -168,6 +168,10 @@ def gen_job(vminfo):
                     "prerelease": False,
                 }
             }),
+            OrderedDict({
+                "name": "Setup Version",
+                "run": 'echo "KMOD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F \'\"\' \'{print $2}\')" >> "$GITHUB_ENV"'
+            }),
             OrderedDict({
                 "uses": "actions/download-artifact@v3",
                 "with": {
@@ -182,17 +186,17 @@ def gen_job(vminfo):
 
             OrderedDict({
                 "name": "Prepare artifact 2-1 ko",
-                "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.ko elkeid_driver/ko || true"
+                "run": "mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.ko elkeid_driver/ko || true"
             }),
 
             OrderedDict({
                 "name": "Prepare artifact 2-2 sign",
-                "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.sign elkeid_driver/ko || true"
+                "run": "mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.sign elkeid_driver/ko || true"
             }),
 
             OrderedDict({
                 "name": "Prepare artifact 2-3 log",
-                "run": "BUILD_VERSION=$(cat LKM/src/init.c | grep MODULE_VERSION | awk -F '\"' '{print $2}') mv -f ~/all_elkeid_drivers/*/*$BUILD_VERSION*.log elkeid_driver/log || true"
+                "run": "mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.log elkeid_driver/log || true"
             }),
 
             OrderedDict({
@@ -221,7 +225,7 @@ def gen_job(vminfo):
             }),
 
             OrderedDict({
-                "name": "Upload Release Asset ",
+                "name": "Upload Release Asset",
                 "id": "upload-release-asset",
                 "uses": "actions/upload-release-asset@v1",
                 "env": {
@@ -280,11 +284,17 @@ def setup_yaml():
 setup_yaml()
 
 with open(".github/workflows/Elkeid_driver_build.yml", "w") as f:
-    config_data = yaml.dump(yaml_cfg_build, default_flow_style=False)
-    config_data = config_data.replace("'", "")
+    config_data = yaml.dump(yaml_cfg_build, 
+    default_style=None,
+    default_flow_style=False)
+    config_data = config_data.replace("'on'", "on")
+    config_data = config_data.replace("'[self-hosted,linux,ARM64]'", "[self-hosted,linux,ARM64]")
     f.write(config_data)
 
 with open(".github/workflows/Elkeid_driver_release.yml", "w") as f:
-    config_data = yaml.dump(yaml_cfg_release, default_flow_style=False)
-    config_data = config_data.replace("'", "")
+    config_data = yaml.dump(yaml_cfg_release, 
+    default_style=None,
+    default_flow_style=False)
+    config_data = config_data.replace("'on'", "on")
+    config_data = config_data.replace("'[self-hosted,linux,ARM64]'", "[self-hosted,linux,ARM64]")
     f.write(config_data)
diff --git a/driver/dockerfiles.x86_64/Dockerfile.debian9 b/driver/dockerfiles.x86_64/Dockerfile.debian9
@@ -7,8 +7,8 @@ RUN sed -i '/deb.debian.org/s/^/#/g' /etc/apt/sources.list
 
 RUN echo "deb http://snapshot.debian.org/archive/debian/20220622T000000Z stretch-backports main" >> /etc/apt/sources.list
 
-
-RUN apt-get -o Acquire::Check-Valid-Until=false update
+RUN rm -rf /var/lib/apt/lists/partial
+RUN apt-get -o Acquire::Check-Valid-Until=false -o Acquire::CompressionTypes::Order::=gz update
 RUN apt-get -o Acquire::Check-Valid-Until=false install -y apt-utils apt-transport-https ca-certificates debian-archive-keyring wget curl
 RUN apt-get -o Acquire::Check-Valid-Until=false install -y gcc build-essential libelf-dev; 
 RUN apt-get -o Acquire::Check-Valid-Until=false install -y linux-compiler-gcc* || true