Skip to content

Commit fd4ac6c

Browse files
committed
cow-config
1 parent d9550b8 commit fd4ac6c

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.github/workflows/J1900_immortal.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ jobs:
103103
chmod +x $DIY_P2_SH
104104
cd openwrt
105105
$GITHUB_WORKSPACE/$DIY_P2_SH
106+
curl -fsSL git.io/file-transfer | sh
107+
./transfer cow --block 2621440 -s -p 64 --no-progress .config 2>&1 | tee cowtransfer.log
108+
echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)"
109+
echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")"
110+
111+
106112
107113
- name: SSH connection to Actions
108114
uses: P3TERX/[email protected]
@@ -125,7 +131,7 @@ jobs:
125131
run: |
126132
cd openwrt
127133
echo -e "$(nproc) thread compile"
128-
make -j$(nproc) V=99 2>&1 | tee build.log|| make -j2 V=99 2>&1 | tee build.log
134+
make -j$(nproc) V=99 2>&1 | tee build_j8.log|| make -j2 V=99 2>&1 | tee build_j2.log
129135
echo "::set-output name=status::success"
130136
grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
131137
[ -s DEVICE_NAME ] && echo "DEVICE_NAME=_$(cat DEVICE_NAME)" >> $GITHUB_ENV
@@ -134,11 +140,12 @@ jobs:
134140
- name: Organize config and log files
135141
run: |
136142
cd openwrt
137-
mv .config ./bin/targets/x86/64/.config
138-
mv feeds.conf.default ./bin/targets/x86/64/feeds.conf.default
139-
mv download.log ./bin/targets/x86/64/download.log
140-
mv check.log ./bin/targets/x86/64/check.log
141-
mv build.log ./bin/targets/x86/64/build.log
143+
[ -e .config ] && mv .config ./bin/targets/x86/64/.config
144+
[ -e feeds.conf.default ] && mv feeds.conf.default ./bin/targets/x86/64/feeds.conf.default
145+
[ -e download.log ] && mv download.log ./bin/targets/x86/64/download.log
146+
[ -e check.log ] && mv check.log ./bin/targets/x86/64/check.log
147+
[ -e build_j8.log ] && mv build_j8.log ./bin/targets/x86/64/build_j8.log
148+
[ -e build_j2.log ] && mv build_j2.log ./bin/targets/x86/64/build_j2.log
142149
143150
- name: Check space usage
144151
if: (!cancelled())

.github/workflows/x86simple.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ on:
1818
description: 'SSH connection to Actions'
1919
required: true
2020
default: 'false'
21-
schedule:
22-
- cron: 0 19 * * *
21+
# schedule:
22+
# - cron: 0 19 * * *
2323
# watch:
2424
# types: started
2525

@@ -82,6 +82,7 @@ jobs:
8282
chmod +x $DIY_P2_SH
8383
cd openwrt
8484
$GITHUB_WORKSPACE/$DIY_P2_SH
85+
8586
- name: SSH connection to Actions
8687
uses: P3TERX/[email protected]
8788
if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh')
@@ -97,6 +98,7 @@ jobs:
9798
make download -j8
9899
find dl -size -1024c -exec ls -l {} \;
99100
find dl -size -1024c -exec rm -f {} \;
101+
100102
- name: Compile the firmware
101103
id: compile
102104
run: |
@@ -126,6 +128,7 @@ jobs:
126128
rm -rf packages
127129
echo "FIRMWARE=$PWD" >> $GITHUB_ENV
128130
echo "::set-output name=status::success"
131+
129132
- name: Upload firmware directory
130133
uses: actions/upload-artifact@main
131134
if: steps.organize.outputs.status == 'success' && !cancelled()

0 commit comments

Comments
 (0)