Skip to content

Commit 90adc8e

Browse files
yury-sannikovyury-sannikov
committed
one more time
1 parent eefd030 commit 90adc8e

File tree

1 file changed

+63
-62
lines changed

1 file changed

+63
-62
lines changed

‎.github/workflows/build-module.yml

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ jobs:
4646
cache-name: "cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-${{ matrix.build_env.target}}-${{ matrix.build_env.subtarget}}"
4747
with:
4848
path: .
49-
key: ${{ runner.os }}-build-vm-${{ env.cache-name }}
49+
key: ${{ runner.os }}-build-vm2-${{ env.cache-name }}
5050
restore-keys: |
51-
${{ runner.os }}-build-vm-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-
51+
${{ runner.os }}-build-vm2-cache-tools-kernel-${{ matrix.tag }}-${{ matrix.build_env.pkgarch}}-
5252
5353
- name: Building kernel and tools
5454
if: ${{ steps.cache-tools-kernel.outputs.cache-hit != 'true' }}
@@ -68,76 +68,77 @@ jobs:
6868
6969
make defconfig
7070
71-
make target/linux/compile V=s || true
72-
73-
VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
74-
VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
75-
76-
if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
77-
echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
78-
exit 1
79-
fi
80-
8171
echo " > make tools/install"
8272
make tools/install -i -j `nproc`
83-
echo " > make toolchain/install"
84-
make toolchain/install -i -j `nproc`
85-
# compile kernel module
86-
echo " > make target/linux/compile"
87-
make target/linux/compile -i -j `nproc` V=s
8873
89-
echo "Final Kernel vermagic:"
9074
cat ./build_dir/target-*/linux-*/linux-*/.vermagic
9175
92-
- name: Update feeds
93-
run: |
94-
wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
95-
echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
96-
97-
./scripts/feeds update luci
98-
./scripts/feeds install -a -p luci
99-
./scripts/feeds update awgopenwrt
100-
./scripts/feeds install -a -p awgopenwrt
101-
102-
wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
103-
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
104-
echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
105-
echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
106-
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
107-
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
108-
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
109-
echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
76+
echo " > make toolchain/install"
77+
make toolchain/install -i -j `nproc`
11078
111-
make defconfig
79+
cat ./build_dir/target-*/linux-*/linux-*/.vermagic
11280
113-
- name: Build amneziawg-tools
114-
run: |
115-
make V=s package/amneziawg-tools/{clean,download,prepare}
116-
make V=s package/amneziawg-tools/compile
81+
# compile kernel module
82+
echo " > make target/linux/compile"
83+
make target/linux/compile -i -j `nproc` V=s
11784
118-
- name: Build kmod-amneziawg
119-
run: |
120-
make package/kmod-amneziawg/{clean,download,prepare}
121-
make package/kmod-amneziawg/compile
85+
VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
86+
VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
12287
123-
- name: Build luci
124-
run: |
125-
make package/luci-app-amneziawg/{clean,download,prepare}
126-
make package/luci-app-amneziawg/compile V=s
88+
if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
89+
echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
90+
exit 1
91+
fi
12792
128-
- name: Prepare artifacts
129-
run: |
130-
tag_name=${{ github.ref_name }}
131-
mkdir -p awgrelease
132-
postfix="${tag_name}_v${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
133-
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
134-
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
135-
cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
136-
137-
- name: Release
138-
uses: softprops/action-gh-release@v1
139-
with:
140-
files: awgrelease/*.ipk
93+
# - name: Update feeds
94+
# run: |
95+
# wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
96+
# echo "src-git awgopenwrt https://github.com/yury-sannikov/awg-openwrt.git" >> ./feeds.conf
97+
98+
# ./scripts/feeds update luci
99+
# ./scripts/feeds install -a -p luci
100+
# ./scripts/feeds update awgopenwrt
101+
# ./scripts/feeds install -a -p awgopenwrt
102+
103+
# wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
104+
# echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
105+
# echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
106+
# echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
107+
# echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
108+
# echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
109+
# echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
110+
# echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
111+
112+
# make defconfig
113+
114+
# - name: Build amneziawg-tools
115+
# run: |
116+
# make V=s package/amneziawg-tools/{clean,download,prepare}
117+
# make V=s package/amneziawg-tools/compile
118+
119+
# - name: Build kmod-amneziawg
120+
# run: |
121+
# make package/kmod-amneziawg/{clean,download,prepare}
122+
# make package/kmod-amneziawg/compile
123+
124+
# - name: Build luci
125+
# run: |
126+
# make package/luci-app-amneziawg/{clean,download,prepare}
127+
# make package/luci-app-amneziawg/compile V=s
128+
129+
# - name: Prepare artifacts
130+
# run: |
131+
# tag_name=${{ github.ref_name }}
132+
# mkdir -p awgrelease
133+
# postfix="${tag_name}_v${{ matrix.tag }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
134+
# cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
135+
# cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
136+
# cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
137+
138+
# - name: Release
139+
# uses: softprops/action-gh-release@v1
140+
# with:
141+
# files: awgrelease/*.ipk
141142

142143
- name: Cleanup
143144
run: |

0 commit comments

Comments
 (0)