Skip to content

Commit

Permalink
add version for custom
Browse files Browse the repository at this point in the history
  • Loading branch information
wjz304 committed Apr 2, 2024
1 parent 5ee4bb9 commit 76abc09
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 56 deletions.
56 changes: 56 additions & 0 deletions .github/workflows/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Copyright (C) 2022 Ing <https://github.com/wjz304>
#
# This is free software, licensed under the MIT License.
# See /LICENSE for more information.
#

name: Data
on:
workflow_dispatch:
inputs:
push:
description: "push"
default: false
type: boolean

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@main

- name: Init Env
run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
sudo timedatectl set-timezone "Asia/Shanghai"
- name: Get models
run: |
models="{"
WORK_PATH="files/initrd/opt/rr"
for M in $(find "${WORK_PATH}/model-configs" -maxdepth 1 -name \*.yml 2>/dev/null | sed 's/.*\///; s/\.yml//'); do
models+="\"${M}\":["
for V in $(yq eval '.productvers | explode(.) | to_entries | map([.key])[] | .[]' "${WORK_PATH}/model-configs/${M}.yml" 2>/dev/null | sort -r); do
models+="\"${V}\","
done
models="${models%,}],"
done
models="${models%,}}"
echo "${models}" >docs/models.json
- name: Check and Push
if: success() && inputs.push == true
run: |
echo "Git push ..."
git pull
status=$(git status -s | grep -E 'docs/models.json' | awk '{printf " %s", $2}')
if [ -n "${status}" ]; then
git add ${status}
git commit -m "update $(date +%Y-%m-%d" "%H:%M:%S)"
git push -f
fi
20 changes: 13 additions & 7 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# See /LICENSE for more information.
#

name: Auto Comment
name: Issues
on:
issues:
types: [opened, reopened]
Expand Down Expand Up @@ -36,14 +36,17 @@ jobs:
iscustom = 'false'
warinfo = 'false'
model = ''
language= ''
model = ''
version = ''
try:
if issuetitle.lower().startswith('custom'):
jsonbody = json.loads(issuebody)
iscustom = 'true'
model = jsonbody.get('model', '')
language = jsonbody.get('language', '')
model = jsonbody.get('model', '')
version = jsonbody.get('version', '')
except ValueError as e:
pass
Expand All @@ -53,8 +56,10 @@ jobs:
set_output("iscustom", iscustom)
set_output("warinfo", warinfo)
set_output("model", model)

set_output("language", language)
set_output("model", model)
set_output("version", version)

- name: Update Comment Warinfo
if: env.warinfo == 'true'
Expand Down Expand Up @@ -126,8 +131,9 @@ jobs:
run: |
# 累了, 毁灭吧!
REPO=${{ github.server_url }}/${{ github.repository }}
MODEL=${{ env.model }}
REPO="${{ github.server_url }}/${{ github.repository }}"
MODEL="${{ env.model }}"
VERSION="${{ env.version }}"
PRERELEASE="false"
TAG=""
Expand Down Expand Up @@ -161,7 +167,7 @@ jobs:
[ -n "${{ env.language }}" ] && echo "${{ env.language }}.UTF-8" | sudo tee rr/ws/mnt/p1/.locale
sudo ./localbuild.sh config ${MODEL}
sudo ./localbuild.sh config "${MODEL}" "${VERSION}"
if [ $? -ne 0 ]; then
echo "config failed"
exit 1
Expand Down
90 changes: 43 additions & 47 deletions docs/issues.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,45 @@

var repo = "RROrg/rr"

function httpGetAsync(theUrl, callback) {
let xmlHttpReq = new XMLHttpRequest();
xmlHttpReq.onreadystatechange = function () {
if (xmlHttpReq.readyState == 4 && xmlHttpReq.status == 200)
callback(xmlHttpReq.responseText);
};
xmlHttpReq.open("GET", theUrl, true); // true for asynchronous
xmlHttpReq.send(null);
}

window.onload = function () {
init();
}

function init() {
$("#model").on("change", changeModel);
changeModel();
httpGetAsync("https://raw.githubusercontent.com/RROrg/rr/main/docs/models.json", function (result) {
_modules = JSON.parse(result);
$("#model").on("change", changeModel);
setModels();
});
}

function setModels() {
var models = Object.keys(_modules).sort();
$("#model")[0].options.length = 0;
for (var i = 0; i < models.length; i++) {
var model = models[i];
$("#model").append(`<option value="${model}">${model}</option>`);
}
changeModel();
}
function changeModel() {
model = $("#model").val();
var versions = _modules[model];
$("#version")[0].options.length = 0;
for (var i = 0; i < versions.length; i++) {
var version = versions[i];
$("#version").append(`<option value="${version}">${version}</option>`);
}
changeproductsimage();
}

Expand All @@ -58,7 +87,7 @@
let formData = new FormData(form);
var title = "custom";
var body = {};
var _parameters = ["title", "language", "model"];
var _parameters = ["title", "language", "model", "version"];
for (var key in _parameters) {
var name = _parameters[key];
if (name == "title") {
Expand Down Expand Up @@ -151,54 +180,21 @@
<div class="form-group-body">
<select class="form-select form-control select-sm input-contrast" id="model" name="inputs[model]"
value="">
<option value="DS1019+">DS1019+</option>
<option value="DS1520+">DS1520+</option>
<option value="DS1522+">DS1522+</option>
<option value="DS1621+">DS1621+</option>
<option value="DS1621xs+">DS1621xs+</option>
<option value="DS1819+">DS1819+</option>
<option value="DS1821+">DS1821+</option>
<option value="DS1823xs+">DS1823xs+</option>
<option value="DS220+">DS220+</option>
<option value="DS224+">DS224+</option>
<option value="DS2419+">DS2419+</option>
<option value="DS2422+">DS2422+</option>
<option value="DS3615xs">DS3615xs</option>
<option value="DS3617xs">DS3617xs</option>
<option value="DS3622xs+">DS3622xs+</option>
<option value="DS423+">DS423+</option>
<option value="DS718+">DS718+</option>
<option value="DS720+">DS720+</option>
<option value="DS723+">DS723+</option>
<!--<option value="DS916+">DS916+</option>-->
<option value="DS918+">DS918+</option>
<option value="DS920+">DS920+</option>
<option value="DS923+">DS923+</option>
<option value="DVA1622">DVA1622</option>
<option value="DVA3219">DVA3219</option>
<option value="DVA3221">DVA3221</option>
<option value="FS2500">FS2500</option>
<!--<option value="FS3017">FS3017</option>-->
<option value="FS6400">FS6400</option>
<option value="HD6500">HD6500</option>
<option value="RS1221+">RS1221+</option>
<option value="RS1619xs+">RS1619xs+</option>
<option value="RS2423+">RS2423+</option>
<option value="RS2423RP+">RS2423RP+</option>
<option value="RS3413xs+">RS3413xs+</option>
<option value="RS3618xs">RS3618xs</option>
<option value="RS3621xs+">RS3621xs+</option>
<option value="RS4021xs+">RS4021xs+</option>
<!--<option value="SA3200D">SA3200D</option>-->
<option value="SA3400">SA3400</option>
<!--<option value="SA3400D">SA3400D</option>-->
<option value="SA3410">SA3410</option>
<option value="SA3600">SA3600</option>
<option value="SA3610">SA3610</option>
<option selected="selected" value="SA6400">SA6400</option>
</select>
</div>
</div>
<div class="form-group mt-1 mb-2 ">
<div class="form-group-header">
<label class="color-fg-default text-mono f6" for="model">Version:</label>
</div>
<div class="form-group-body">
<select class="form-select form-control select-sm input-contrast" id="version" name="inputs[version]"
value="">
<option selected="selected" value="7.2">7.2</option>
</select>
</div>
</div>
<div data-replace-remote-form-target="" class="workflow-dispatch">
<form id="inputs">
<button type="button" class="btn State--merged" onclick="return createIssues()" autofocus="">
Expand Down
4 changes: 2 additions & 2 deletions localbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ function config() {
echo "init"
./init.sh || break
echo "model"
./menu.sh modelMenu "${1}" || break
./menu.sh modelMenu "${1:-"SA6400"}" || break
echo "version"
./menu.sh productversMenu "7.2" || break
./menu.sh productversMenu "${2:-"7.2"}" || break
echo "build"
./menu.sh make -1 || break
echo "clean"
Expand Down

0 comments on commit 76abc09

Please sign in to comment.