mirror of
https://github.com/RROrg/rr.git
synced 2025-08-22 12:37:18 +08:00
Compare commits
No commits in common. "00dd56679cb79b10042fc7e34c248f5138f7eef4" and "a3a736e64bad5527f051855ec798f1f4f8d665cb" have entirely different histories.
00dd56679c
...
a3a736e64b
9
.github/workflows/data.yml
vendored
9
.github/workflows/data.yml
vendored
@ -7,10 +7,6 @@
|
|||||||
|
|
||||||
name: Data
|
name: Data
|
||||||
on:
|
on:
|
||||||
release:
|
|
||||||
types:
|
|
||||||
- created
|
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
push:
|
push:
|
||||||
@ -72,7 +68,7 @@ jobs:
|
|||||||
python scripts/func.py getmodules -w "rr/ws" -j "docs/modules.json" -x "docs/modules.xlsx"
|
python scripts/func.py getmodules -w "rr/ws" -j "docs/modules.json" -x "docs/modules.xlsx"
|
||||||
|
|
||||||
- name: Upload to Artifacts
|
- name: Upload to Artifacts
|
||||||
if: success()
|
if: success() && inputs.push == false
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: addons
|
name: addons
|
||||||
@ -82,10 +78,9 @@ jobs:
|
|||||||
retention-days: 5
|
retention-days: 5
|
||||||
|
|
||||||
- name: Check and Push
|
- name: Check and Push
|
||||||
if: success() && (inputs.push == true || github.event.action == 'created')
|
if: success() && inputs.push == true
|
||||||
run: |
|
run: |
|
||||||
echo "Git push ..."
|
echo "Git push ..."
|
||||||
git checkout main
|
|
||||||
git pull
|
git pull
|
||||||
status=$(git status -s | grep -E "docs" | awk '{printf " %s", $2}')
|
status=$(git status -s | grep -E "docs" | awk '{printf " %s", $2}')
|
||||||
if [ -n "${status}" ]; then
|
if [ -n "${status}" ]; then
|
||||||
|
BIN
docs/addons.xlsx
BIN
docs/addons.xlsx
Binary file not shown.
BIN
docs/models.xlsx
BIN
docs/models.xlsx
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -201,7 +201,6 @@ else
|
|||||||
COUNT=$((${COUNT} + 1))
|
COUNT=$((${COUNT} + 1))
|
||||||
echo -n "."
|
echo -n "."
|
||||||
sleep 1
|
sleep 1
|
||||||
/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
|
|
||||||
done
|
done
|
||||||
echo "$(TEXT "Waiting IP.")"
|
echo "$(TEXT "Waiting IP.")"
|
||||||
for N in ${ETHX}; do
|
for N in ${ETHX}; do
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
RR_VERSION="24.4.7"
|
RR_VERSION="24.4.6"
|
||||||
RR_TITLE="RR v${RR_VERSION}"
|
RR_TITLE="RR v${RR_VERSION}"
|
||||||
|
|
||||||
# Define paths
|
# Define paths
|
||||||
|
@ -146,7 +146,6 @@ while [ ${COUNT} -lt 30 ]; do
|
|||||||
COUNT=$((${COUNT} + 1))
|
COUNT=$((${COUNT} + 1))
|
||||||
echo -n "."
|
echo -n "."
|
||||||
sleep 1
|
sleep 1
|
||||||
/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
|
|
||||||
done
|
done
|
||||||
echo "$(TEXT "Waiting IP.")"
|
echo "$(TEXT "Waiting IP.")"
|
||||||
for N in ${ETHX}; do
|
for N in ${ETHX}; do
|
||||||
|
@ -1 +1 @@
|
|||||||
24.4.7
|
24.4.6
|
||||||
|
Loading…
x
Reference in New Issue
Block a user