添加 debug 模式到 issues

This commit is contained in:
Ing 2025-05-13 18:01:00 +08:00
parent a402fb700f
commit 798e03dfba
2 changed files with 67 additions and 1 deletions

View File

@ -41,6 +41,8 @@ jobs:
size = '' size = ''
template = '' template = ''
language= '' language= ''
sn = ''
macs = ''
model = '' model = ''
version = '' version = ''
kernel = '' kernel = ''
@ -54,6 +56,8 @@ jobs:
size = jsonbody.get('size', '') size = jsonbody.get('size', '')
template = jsonbody.get('template', '') template = jsonbody.get('template', '')
language = jsonbody.get('language', '') language = jsonbody.get('language', '')
sn = jsonbody.get('sn', '')
macs = jsonbody.get('macs', '')
model = jsonbody.get('model', '') model = jsonbody.get('model', '')
version = jsonbody.get('version', '') version = jsonbody.get('version', '')
kernel = jsonbody.get('kernel', '') kernel = jsonbody.get('kernel', '')
@ -73,6 +77,8 @@ jobs:
set_output("size", size) set_output("size", size)
set_output("template", template) set_output("template", template)
set_output("language", language) set_output("language", language)
set_output("sn", sn)
set_output("macs", macs)
set_output("model", model) set_output("model", model)
set_output("version", version) set_output("version", version)
set_output("kernel", kernel) set_output("kernel", kernel)
@ -237,6 +243,20 @@ jobs:
exit 1 exit 1
fi fi
if [ -n "${{ env.sn }}" ]; then
echo "set sn: ${{ env.sn }}"
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
fi
if [ -n "${{ env.macs }}" ]; then
echo "set macs: ${{ env.macs }}"
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
MACS=($(echo "${{ env.macs }}" | sed 's/[:-]//g' | sed 's/.*/\U&/' | sed 's/[;,]/ /g'))
writeConfigKey "mac1" "${MACS[0]}" "${USER_CONFIG_FILE}"
writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
fi
if [ -n "${{ env.addons }}" ]; then if [ -n "${{ env.addons }}" ]; then
echo "set addons: ${{ env.addons }}" echo "set addons: ${{ env.addons }}"
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"

View File

@ -36,12 +36,29 @@
<script type="application/javascript"> <script type="application/javascript">
var repo = "RROrg/rr" var repo = "RROrg/rr"
var debug = getUrlParam("debug");
var _models = {}; var _models = {};
var _pats = {}; var _pats = {};
var _addons = {}; var _addons = {};
var _modules = {}; var _modules = {};
function getUrlParam(paraName) {
var url = document.location.toString();
var arrObj = url.split("?");
if (arrObj.length > 1) {
var arrPara = arrObj[1].split("&");
var arr;
for (var i = 0; i < arrPara.length; i++) {
arr = arrPara[i].split("=");
if (arr != null && arr[0] == paraName) {
return arr[1];
}
}
}
return "";
}
function httpGetAsync(theUrl, callback) { function httpGetAsync(theUrl, callback) {
let xmlHttpReq = new XMLHttpRequest(); let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.onreadystatechange = function () { xmlHttpReq.onreadystatechange = function () {
@ -70,6 +87,13 @@
$("#language").on("change", changeVersion); $("#language").on("change", changeVersion);
$("#kernel").on("change", chanageKernel); $("#kernel").on("change", chanageKernel);
$('#addons').val("acpid,mountloader,powersched,reboottoloader,trivial,vmtools"); $('#addons').val("acpid,mountloader,powersched,reboottoloader,trivial,vmtools");
if (debug) {
$('#sn_item').show();
$('#macs_item').show();
} else {
$('#sn_item').hide();
$('#macs_item').hide();
}
setModels(); setModels();
}); });
}); });
@ -89,6 +113,7 @@
} }
changeModel(); changeModel();
} }
function changeModel() { function changeModel() {
model = $("#model").val(); model = $("#model").val();
var versions = []; var versions = [];
@ -117,6 +142,7 @@
createModulesBtn(); createModulesBtn();
chanageKernel(); chanageKernel();
} }
function createAddonsBtn() { function createAddonsBtn() {
var language = $("#language").val(); var language = $("#language").val();
var extstr = $('#addons').val().split(","); var extstr = $('#addons').val().split(",");
@ -208,6 +234,9 @@
var title = "custom"; var title = "custom";
var body = {}; var body = {};
var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"]; var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
if (debug) {
_parameters.push("sn", "macs");
}
for (var key in _parameters) { for (var key in _parameters) {
var name = _parameters[key]; var name = _parameters[key];
if ($("#" + name).is(":hidden")) { continue; } if ($("#" + name).is(":hidden")) { continue; }
@ -318,7 +347,8 @@
<label class="color-fg-default text-mono f6">Template:</label> <label class="color-fg-default text-mono f6">Template:</label>
</div> </div>
<div class="form-group-body"> <div class="form-group-body">
<select class="form-select form-control select-sm input-contrast" id="template" name="inputs[template]" value=""> <select class="form-select form-control select-sm input-contrast" id="template" name="inputs[template]"
value="">
<option value="true">true</option> <option value="true">true</option>
<option selected="selected" value="false">false</option> <option selected="selected" value="false">false</option>
</select> </select>
@ -349,6 +379,22 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group mt-1 mb-2" id="sn_item">
<div class="form-group-header">
<label class="color-fg-default text-mono f6">SN:</label>
</div>
<div class="form-group-body">
<input class="form-control input-contrast input-sm" type="text" id="sn" name="inputs[sn]" value=""></input>
</div>
</div>
<div class="form-group mt-1 mb-2" id="macs_item">
<div class="form-group-header">
<label class="color-fg-default text-mono f6">MACs: (Please separate multiple with ','.)</label>
</div>
<div class="form-group-body">
<input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
</div>
</div>
<div class="form-group mt-1 mb-2" id="model_item"> <div class="form-group mt-1 mb-2" id="model_item">
<div class="form-group-header"> <div class="form-group-header">
<label class="color-fg-default text-mono f6">Model:</label> <label class="color-fg-default text-mono f6">Model:</label>