Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit c00332e

Browse files
Chikage0o0Chikage0o0
committed
bump 22.03.3
1 parent e75ab91 commit c00332e

File tree

5 files changed

+135
-140
lines changed

5 files changed

+135
-140
lines changed

‎.github/workflows/compile-ipk.yml

+64-66
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# This is free software, lisence use MIT.
3-
#
4-
#
3+
#
4+
#
55
# <https://github.com/Chikage0o0/openwrt-packages>
66
#
77

@@ -22,82 +22,80 @@ on:
2222

2323
env:
2424
REMOTE_PATH: drive:Public/Openwrt/Package
25-
VERSION: 22.03.2
25+
VERSION: 22.03.3
2626
USE_TG: true
27-
27+
2828
jobs:
2929
compile-ipk:
3030
runs-on: Ubuntu-20.04
3131

32-
strategy:
33-
fail-fast: false
32+
strategy:
33+
fail-fast: false
3434
matrix:
35-
target: [x86-64,ramips-mt7621,rockchip-armv8]
35+
target: [x86-64, ramips-mt7621, rockchip-armv8]
3636

3737
steps:
38-
- name: Checkout
39-
uses: actions/checkout@main
40-
with:
41-
fetch-depth: 2
38+
- name: Checkout
39+
uses: actions/checkout@main
40+
with:
41+
fetch-depth: 2
42+
43+
- name: 配置RCLONE
44+
uses: NiceLabs/rclone-action@master
45+
with:
46+
github-token: ${{ secrets.SECRET_TOKEN }}
47+
config: ${{ secrets.RCLONE_CONFIG }}
48+
config-secret-name: RCLONE_CONFIG
4249

43-
- name: 配置RCLONE
44-
uses: NiceLabs/rclone-action@master
45-
with:
46-
github-token: ${{ secrets.SECRET_TOKEN }}
47-
config: ${{ secrets.RCLONE_CONFIG }}
48-
config-secret-name: RCLONE_CONFIG
50+
- name: 准备环境
51+
run: |
52+
sudo mkdir -p /workdir
53+
sudo chown $USER:$GROUPS /workdir
54+
mkdir -p /workdir/packages/ $$ mkdir -p /workdir/error/
55+
rclone copy $REMOTE_PATH/$VERSION/${{matrix.target}} /workdir/packages/ || true
56+
echo "${{ secrets.SECRET_KEY }}" > /workdir/key-build
57+
docker run -dt --name sdk -v /workdir/packages/:/home/build/packages/ \
58+
-v /workdir/key-build:/home/build/openwrt/key-build \
59+
-v $GITHUB_WORKSPACE:/home/build/custom-feed/ \
60+
-v $GITHUB_WORKSPACE/diy/config/${{matrix.target}}.config:/home/build/openwrt/custom.config \
61+
-v /workdir/error/:/home/build/openwrt/error/ \
62+
openwrtorg/sdk:${{matrix.target}}-$VERSION
4963
64+
- name: SSH connection to Actions
65+
if: github.event.inputs.ssh == 'true'
66+
uses: mxschmitt/action-tmate@v1
5067

51-
- name: 准备环境
52-
run: |
53-
sudo mkdir -p /workdir
54-
sudo chown $USER:$GROUPS /workdir
55-
mkdir -p /workdir/packages/ $$ mkdir -p /workdir/error/
56-
rclone copy $REMOTE_PATH/$VERSION/${{matrix.target}} /workdir/packages/ || true
57-
echo "${{ secrets.SECRET_KEY }}" > /workdir/key-build
58-
docker run -dt --name sdk -v /workdir/packages/:/home/build/packages/ \
59-
-v /workdir/key-build:/home/build/openwrt/key-build \
60-
-v $GITHUB_WORKSPACE:/home/build/custom-feed/ \
61-
-v $GITHUB_WORKSPACE/diy/config/${{matrix.target}}.config:/home/build/openwrt/custom.config \
62-
-v /workdir/error/:/home/build/openwrt/error/ \
63-
openwrtorg/sdk:${{matrix.target}}-$VERSION
68+
- name: 编译
69+
if: github.event.inputs.ssh != 'true'
70+
run: docker exec sdk /bin/bash /home/build/custom-feed/diy/sh/compile.sh ${{ github.event.inputs.rebuild }}
6471

65-
- name: SSH connection to Actions
66-
if: github.event.inputs.ssh == 'true'
67-
uses: mxschmitt/action-tmate@v1
72+
- name: 编译完成后清理
73+
run: |
74+
docker rm -f sdk
75+
if [`ls -A /workdir/error/` == ""] ;then
76+
echo "compile_error=false" >> $GITHUB_ENV
77+
else
78+
echo "compile_error=true" >> $GITHUB_ENV
79+
fi
80+
sudo chown -R $USER:$GROUPS /workdir
81+
sudo chown -R $USER:$GROUPS $GITHUB_WORKSPACE
6882
69-
- name: 编译
70-
if: github.event.inputs.ssh != 'true'
71-
run: docker exec sdk /bin/bash /home/build/custom-feed/diy/sh/compile.sh ${{ github.event.inputs.rebuild }}
83+
- name: 如果出现失败上传Artifact
84+
if: env.compile_error == 'true'
85+
uses: actions/upload-artifact@v3
86+
with:
87+
name: ${{matrix.target}}-error
88+
path: /workdir/error/
7289

73-
- name: 编译完成后清理
74-
run: |
75-
docker rm -f sdk
76-
if [`ls -A /workdir/error/` == ""] ;then
77-
echo "compile_error=false" >> $GITHUB_ENV
78-
else
79-
echo "compile_error=true" >> $GITHUB_ENV
80-
fi
81-
sudo chown -R $USER:$GROUPS /workdir
82-
sudo chown -R $USER:$GROUPS $GITHUB_WORKSPACE
90+
- name: 如果出现失败通知TG
91+
if: env.compile_error == 'true' && env.USE_TG == 'true'
92+
uses: appleboy/telegram-action@master
93+
with:
94+
to: ${{ secrets.TELEGRAM_TO }}
95+
token: ${{ secrets.TELEGRAM_TOKEN }}
96+
message: some errors in compile
8397

84-
- name: 如果出现失败上传Artifact
85-
if: env.compile_error == 'true'
86-
uses: actions/upload-artifact@v3
87-
with:
88-
name: ${{matrix.target}}-error
89-
path: /workdir/error/
90-
91-
- name: 如果出现失败通知TG
92-
if: env.compile_error == 'true' && env.USE_TG == 'true'
93-
uses: appleboy/telegram-action@master
94-
with:
95-
to: ${{ secrets.TELEGRAM_TO }}
96-
token: ${{ secrets.TELEGRAM_TOKEN }}
97-
message: some errors in compile
98-
99-
- name: 上传至目标存储
100-
run: |
101-
rclone delete $REMOTE_PATH/$VERSION/${{matrix.target}}/ || true
102-
rclone copy /workdir/packages/ $REMOTE_PATH/$VERSION/${{matrix.target}}/
103-
98+
- name: 上传至目标存储
99+
run: |
100+
rclone delete $REMOTE_PATH/$VERSION/${{matrix.target}}/ || true
101+
rclone copy /workdir/packages/ $REMOTE_PATH/$VERSION/${{matrix.target}}/

‎.github/workflows/imagebuild.yml

+68-71
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# This is free software, lisence use MIT.
3-
#
4-
#
3+
#
4+
#
55
# <https://github.com/Chikage0o0/openwrt-packages>
66
#
77

@@ -15,91 +15,88 @@ on:
1515
default: 'false'
1616
schedule:
1717
- cron: 0 0 1 * *
18-
18+
1919
env:
2020
REMOTE_PATH: drive:Public/Openwrt/Package
21-
VERSION: 22.03.2
21+
VERSION: 22.03.3
2222
USE_TG: false
2323

2424
jobs:
2525
image-build:
2626
runs-on: Ubuntu-20.04
2727

28-
strategy:
29-
fail-fast: false
28+
strategy:
29+
fail-fast: false
3030
matrix:
31-
target: [x86-64,ramips-mt7621,rockchip-armv8]
31+
target: [x86-64, ramips-mt7621, rockchip-armv8]
3232

3333
steps:
34-
- name: Checkout
35-
uses: actions/checkout@main
34+
- name: Checkout
35+
uses: actions/checkout@main
3636

37-
- name: 配置RCLONE
38-
uses: NiceLabs/rclone-action@master
39-
with:
40-
github-token: ${{ secrets.SECRET_TOKEN }}
41-
config: ${{ secrets.RCLONE_CONFIG }}
42-
config-secret-name: RCLONE_CONFIG
37+
- name: 配置RCLONE
38+
uses: NiceLabs/rclone-action@master
39+
with:
40+
github-token: ${{ secrets.SECRET_TOKEN }}
41+
config: ${{ secrets.RCLONE_CONFIG }}
42+
config-secret-name: RCLONE_CONFIG
4343

44-
- name: 准备环境
45-
run: |
46-
sudo mkdir -p /workdir
47-
sudo chown $USER:$GROUPS /workdir
48-
mkdir -p /workdir/packages/ $$ mkdir -p /workdir/error/
49-
rclone copy $REMOTE_PATH/$VERSION/${{matrix.target}} /workdir/packages/ || true
50-
echo "${{ secrets.SECRET_KEY }}" > /workdir/key-build
51-
docker run -dt --name imagebuilder -v /workdir/packages/:/home/build/openwrt/packages/ \
52-
-v $GITHUB_WORKSPACE/diy/sh/target/${{matrix.target}}.sh:/home/build/openwrt/target.sh \
53-
-v $GITHUB_WORKSPACE/diy/sh/imagebuild.sh:/home/build/openwrt/imagebuild.sh \
54-
-v $GITHUB_WORKSPACE/diy/files/${{matrix.target}}/:/home/build/openwrt/files/ \
55-
-v $GITHUB_WORKSPACE/diy/tool/:/home/build/openwrt/tool/ \
56-
-v /workdir/bin/target/:/home/build/openwrt/bin/targets/ \
57-
openwrtorg/imagebuilder:${{matrix.target}}-$VERSION
58-
59-
- name: SSH connection to Actions
60-
if: github.event.inputs.ssh == 'true'
61-
uses: mxschmitt/action-tmate@v1
44+
- name: 准备环境
45+
run: |
46+
sudo mkdir -p /workdir
47+
sudo chown $USER:$GROUPS /workdir
48+
mkdir -p /workdir/packages/ $$ mkdir -p /workdir/error/
49+
rclone copy $REMOTE_PATH/$VERSION/${{matrix.target}} /workdir/packages/ || true
50+
echo "${{ secrets.SECRET_KEY }}" > /workdir/key-build
51+
docker run -dt --name imagebuilder -v /workdir/packages/:/home/build/openwrt/packages/ \
52+
-v $GITHUB_WORKSPACE/diy/sh/target/${{matrix.target}}.sh:/home/build/openwrt/target.sh \
53+
-v $GITHUB_WORKSPACE/diy/sh/imagebuild.sh:/home/build/openwrt/imagebuild.sh \
54+
-v $GITHUB_WORKSPACE/diy/files/${{matrix.target}}/:/home/build/openwrt/files/ \
55+
-v $GITHUB_WORKSPACE/diy/tool/:/home/build/openwrt/tool/ \
56+
-v /workdir/bin/target/:/home/build/openwrt/bin/targets/ \
57+
openwrtorg/imagebuilder:${{matrix.target}}-$VERSION
6258
63-
- name: 编译
64-
if: github.event.inputs.ssh != 'true'
65-
run: docker exec imagebuilder /bin/bash /home/build/openwrt/imagebuild.sh
59+
- name: SSH connection to Actions
60+
if: github.event.inputs.ssh == 'true'
61+
uses: mxschmitt/action-tmate@v1
6662

67-
- name: 编译完成后清理
68-
run: |
69-
docker rm -f imagebuilder
70-
sudo chown -R $USER:$GROUPS /workdir
71-
sudo chown -R $USER:$GROUPS $GITHUB_WORKSPACE
72-
if [[ `find /workdir/bin/target/ -name *.img.gz -or -name *.bin` ]] ;then
73-
echo "image_build=true" >> $GITHUB_ENV
74-
else
75-
echo "image_build=false" >> $GITHUB_ENV
76-
fi
63+
- name: 编译
64+
if: github.event.inputs.ssh != 'true'
65+
run: docker exec imagebuilder /bin/bash /home/build/openwrt/imagebuild.sh
7766

78-
- name: 移动编译完成的固件
79-
if: env.image_build == 'true'
80-
run: |
81-
mkdir /workdir/image
82-
for img in `find /workdir/bin/target/ -name *.img.gz -or -name *sysupgrade.bin`; do
83-
mv $img /workdir/image
84-
done
67+
- name: 编译完成后清理
68+
run: |
69+
docker rm -f imagebuilder
70+
sudo chown -R $USER:$GROUPS /workdir
71+
sudo chown -R $USER:$GROUPS $GITHUB_WORKSPACE
72+
if [[ `find /workdir/bin/target/ -name *.img.gz -or -name *.bin` ]] ;then
73+
echo "image_build=true" >> $GITHUB_ENV
74+
else
75+
echo "image_build=false" >> $GITHUB_ENV
76+
fi
8577
86-
- name: 生成Release信息
87-
id: tag
88-
if: env.image_build == 'true'
89-
run: |
90-
echo "::set-output name=release_body::本次固件编译于$(date +"%Y.%m.%d")"
78+
- name: 移动编译完成的固件
79+
if: env.image_build == 'true'
80+
run: |
81+
mkdir /workdir/image
82+
for img in `find /workdir/bin/target/ -name *.img.gz -or -name *sysupgrade.bin`; do
83+
mv $img /workdir/image
84+
done
9185
92-
- name: 上传固件到Release
93-
uses: ncipollo/release-action@v1
94-
with:
95-
name: Openwrt ${{env.VERSION}}_${{matrix.target}}
96-
allowUpdates: true
97-
body: ${{ steps.tag.outputs.release_body }}
98-
tag: Openwrt_${{env.VERSION}}_${{matrix.target}}
99-
commit: main
100-
replacesArtifacts: true
101-
token: ${{ secrets.SECRET_TOKEN }}
102-
artifacts: /workdir/image/*
86+
- name: 生成Release信息
87+
id: tag
88+
if: env.image_build == 'true'
89+
run: |
90+
echo "::set-output name=release_body::本次固件编译于$(date +"%Y.%m.%d")"
10391
104-
105-
92+
- name: 上传固件到Release
93+
uses: ncipollo/release-action@v1
94+
with:
95+
name: Openwrt ${{env.VERSION}}_${{matrix.target}}
96+
allowUpdates: true
97+
body: ${{ steps.tag.outputs.release_body }}
98+
tag: Openwrt_${{env.VERSION}}_${{matrix.target}}
99+
commit: main
100+
replacesArtifacts: true
101+
token: ${{ secrets.SECRET_TOKEN }}
102+
artifacts: /workdir/image/*

‎diy/files/ramips-mt7621/etc/uci-defaults/99-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#edit feeds
44
sed -i 's/downloads.openwrt.org/mirrors.ustc.edu.cn\/openwrt/g' /etc/opkg/distfeeds.conf
5-
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.2/ramips-mt7621' >> /etc/opkg/distfeeds.conf
5+
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.3/ramips-mt7621' >> /etc/opkg/distfeeds.conf
66

77
[ "$(uci -q get system.@system[0].init)" != "" ] && exit 0
88
#set lan ip

‎diy/files/rockchip-armv8/etc/uci-defaults/99-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#edit feeds
44
sed -i 's/downloads.openwrt.org/mirrors.ustc.edu.cn\/openwrt/g' /etc/opkg/distfeeds.conf
5-
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.2/rockchip-armv8' >> /etc/opkg/distfeeds.conf
5+
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.3/rockchip-armv8' >> /etc/opkg/distfeeds.conf
66

77
[ "$(uci -q get system.@system[0].init)" != "" ] && exit 0
88
#set lan ip

‎diy/files/x86-64/etc/uci-defaults/99-custom

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#edit feeds
44
sed -i 's/downloads.openwrt.org/mirrors.ustc.edu.cn\/openwrt/g' /etc/opkg/distfeeds.conf
5-
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.2/x86-64' >> /etc/opkg/distfeeds.conf
5+
[ "$(grep "custom" /etc/opkg/distfeeds.conf)" == "" ] && echo 'src/gz custom https://drive.939.me/api/raw/?path=/Openwrt/Package/22.03.3/x86-64' >> /etc/opkg/distfeeds.conf
66

77
[ "$(uci -q get system.@system[0].init)" != "" ] && exit 0
88
#set lan ip

0 commit comments

Comments
 (0)