Skip to content

Commit 43b6421

Browse files
committed
ci: update 1.7* kmod release artifacts name format
1 parent 4e2b8f3 commit 43b6421

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

.github/workflows/Elkeid_driver_release.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -2584,9 +2584,17 @@ jobs:
25842584
prerelease: false
25852585
release_name: Release ${{github.ref}}
25862586
tag_name: ${{github.ref}}
2587+
- uses: actions/checkout@v3
2588+
with:
2589+
submodules: false
25872590
- name: Setup Version
25882591
run: echo "KMOD_VERSION=$(cat driver/LKM/src/init.c | grep MODULE_VERSION |
25892592
awk -F '"' '{print $2}')" >> "$GITHUB_ENV"
2593+
- name: Setup output Version format
2594+
run: echo "KMOD_RELEASE_PREFIX=$(echo $KMOD_VERSION | sed -e "s|\.|\_|g")" >>
2595+
"$GITHUB_ENV"
2596+
- name: Setup output Version format
2597+
run: echo "KO_TAR_XZ="$KMOD_RELEASE_PREFIX"_elkeid_driver_ko_$(date +"%Y%m%d").tar.xz" >> "$GITHUB_ENV"
25902598
- uses: actions/download-artifact@v3
25912599
with:
25922600
path: ~/all_elkeid_drivers
@@ -2599,7 +2607,7 @@ jobs:
25992607
- name: Prepare artifact 2-3 log
26002608
run: mv -f ~/all_elkeid_drivers/*/*$KMOD_VERSION*.log elkeid_driver/log || true
26012609
- name: Pack artifact
2602-
run: tar -C elkeid_driver -cJf elkeid_driver_ko.tar.xz ko
2610+
run: tar -C elkeid_driver -cJf "$KO_TAR_XZ" ko
26032611
- name: Pack log
26042612
run: zip -r elkeid_driver_log.zip elkeid_driver/log
26052613
- name: Upload log
@@ -2619,8 +2627,8 @@ jobs:
26192627
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26202628
with:
26212629
asset_content_type: application/x-tar
2622-
asset_name: elkeid_driver_ko.tar.xz
2623-
asset_path: ./elkeid_driver_ko.tar.xz
2630+
asset_name: ${{env.KO_TAR_XZ}}
2631+
asset_path: ${{env.KO_TAR_XZ}}
26242632
upload_url: ${{steps.create_release.outputs.upload_url}}
26252633
needs:
26262634
- build_debian8_x86_64

driver/build_script/gen_ci_from_dockerfiles.py

+17-3
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,24 @@ def gen_job(vminfo):
171171
"prerelease": False,
172172
}
173173
}),
174+
OrderedDict({
175+
"uses": "actions/checkout@v3",
176+
"with": {
177+
"submodules": False
178+
}
179+
}),
174180
OrderedDict({
175181
"name": "Setup Version",
176182
"run": 'echo "KMOD_VERSION=$(cat driver/LKM/src/init.c | grep MODULE_VERSION | awk -F \'\"\' \'{print $2}\')" >> "$GITHUB_ENV"'
177183
}),
184+
OrderedDict({
185+
"name": "Setup output Version format",
186+
"run": 'echo "KMOD_RELEASE_PREFIX=$(echo $KMOD_VERSION | sed -e "s|\\.|\\_|g")" >> "$GITHUB_ENV"'
187+
}),
188+
OrderedDict({
189+
"name": "Setup output Version format",
190+
"run": 'echo "KO_TAR_XZ=\"$KMOD_RELEASE_PREFIX\"_elkeid_driver_ko_$(date +\"%Y%m%d\").tar.xz" >> "$GITHUB_ENV"'
191+
}),
178192
OrderedDict({
179193
"uses": "actions/download-artifact@v3",
180194
"with": {
@@ -204,7 +218,7 @@ def gen_job(vminfo):
204218

205219
OrderedDict({
206220
"name": "Pack artifact",
207-
"run": "tar -C elkeid_driver -cJf elkeid_driver_ko.tar.xz ko"
221+
"run": "tar -C elkeid_driver -cJf \"$KO_TAR_XZ\" ko"
208222
}),
209223

210224
OrderedDict({
@@ -236,8 +250,8 @@ def gen_job(vminfo):
236250
},
237251
"with": {
238252
"upload_url": "${{steps.create_release.outputs.upload_url}}",
239-
"asset_path": "./elkeid_driver_ko.tar.xz",
240-
"asset_name": "elkeid_driver_ko.tar.xz",
253+
"asset_path": "${{env.KO_TAR_XZ}}",
254+
"asset_name": "${{env.KO_TAR_XZ}}",
241255
"asset_content_type": "application/x-tar"
242256
},
243257
})

0 commit comments

Comments
 (0)