Compare commits
3 Commits
v23.05.6
...
feat/add-m
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
907370501c | ||
|
|
55a2e3c3f0 | ||
|
|
e9dc49aeda |
29
.github/workflows/build-module.yml
vendored
29
.github/workflows/build-module.yml
vendored
@@ -9,6 +9,20 @@ on:
|
||||
tag_name:
|
||||
required: true
|
||||
type: string
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'OpenWRT version (e.g., 24.10.3)'
|
||||
required: true
|
||||
type: string
|
||||
targets:
|
||||
description: 'Targets (comma-separated, e.g., "stm32,ramips")'
|
||||
required: true
|
||||
type: string
|
||||
subtargets:
|
||||
description: 'Subtargets (comma-separated, e.g., "stm32mp1,mt7621")'
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
generate-config:
|
||||
@@ -27,8 +41,12 @@ jobs:
|
||||
- name: Get OpenWRT version from tag
|
||||
id: get_version
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" == "workflow_call" ]; then
|
||||
echo "VERSION=${{ inputs.tag_name }}" >> $GITHUB_ENV
|
||||
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
|
||||
echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
|
||||
echo "TARGETS=${{ inputs.targets }}" >> $GITHUB_ENV
|
||||
echo "SUBTARGETS=${{ inputs.subtargets }}" >> $GITHUB_ENV
|
||||
elif [ "${{ github.event_name }}" == "workflow_call" ]; then
|
||||
VERSION="${{ inputs.tag_name }}"
|
||||
echo "VERSION=${VERSION#v}" >> $GITHUB_ENV
|
||||
else
|
||||
echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
|
||||
@@ -39,7 +57,7 @@ jobs:
|
||||
|
||||
- name: Generate Job Config
|
||||
id: generate-config
|
||||
run: node index.js ${{ env.VERSION }}
|
||||
run: node index.js ${{ env.VERSION }} "${{ env.TARGETS }}" "${{ env.SUBTARGETS }}"
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -56,6 +74,11 @@ jobs:
|
||||
- name: Checkout AWG source code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install Python dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y python3-pyelftools
|
||||
|
||||
- name: Cache OpenWrt SDK
|
||||
id: cache-sdk
|
||||
uses: actions/cache@v4
|
||||
|
||||
187
.github/workflows/build-to-all-latest-snapshots.yml
vendored
187
.github/workflows/build-to-all-latest-snapshots.yml
vendored
@@ -1,187 +0,0 @@
|
||||
name: Build AmneziaWG for snapshot OpenWRT
|
||||
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "SNAPSHOT"
|
||||
# schedule:
|
||||
# - cron: '0 */4 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
generate-config:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
job-config: ${{ steps.generate-config.outputs.job-config }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20.16.0'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install
|
||||
|
||||
- name: Generate Job Config
|
||||
id: generate-config
|
||||
run: node index.js SNAPSHOT
|
||||
|
||||
build:
|
||||
name: "${{ matrix.build_env.tag }} - ${{ matrix.build_env.pkgarch}} :: ${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}} build"
|
||||
runs-on: ubuntu-latest
|
||||
needs: generate-config
|
||||
strategy:
|
||||
matrix:
|
||||
build_env: ${{ fromJson(needs.generate-config.outputs.job-config) }}
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- name: Check if release file exists
|
||||
id: check_release
|
||||
run: |
|
||||
postfix="${{ matrix.build_env.tag }}_${{ matrix.build_env.vermagic }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
|
||||
RELEASE_FILE="kmod-amneziawg_${postfix}.ipk"
|
||||
TAG=${{ matrix.build_env.tag }}
|
||||
|
||||
echo "Checking for release file: $RELEASE_FILE in release: $TAG"
|
||||
|
||||
# Используем GitHub CLI для проверки наличия файла в релизе
|
||||
if gh release view "$TAG" --repo Slava-Shchipunov/awg-openwrt --json assets --jq ".assets | .[].name" | grep -q "$RELEASE_FILE"; then
|
||||
echo "Release file $RELEASE_FILE already exists. Skipping job."
|
||||
echo "FILE_EXISTS=true" >> $GITHUB_ENV
|
||||
else
|
||||
echo "FILE_EXISTS=false" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
# Прерываем job'у, если файл уже существует
|
||||
- name: Skip job if release file exists
|
||||
if: env.FILE_EXISTS == 'true'
|
||||
run: |
|
||||
echo "Skipping job as release file already exists."
|
||||
exit 0
|
||||
|
||||
- name: Get snapshot commit SHA and device ARCH
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: |
|
||||
PROFILE_URL="https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/profiles.json"
|
||||
SNAPSHOT_COMMIT_SHA=$(wget -q $PROFILE_URL -O- | tr ',' '\n' | grep "version_code"| awk -F: '{print $2}' | tr -d '"' | awk -F- '{print $2}')
|
||||
echo "Snapshot commit sha: $SNAPSHOT_COMMIT_SHA"
|
||||
echo "SNAPSHOT_COMMIT_SHA=$SNAPSHOT_COMMIT_SHA" >> $GITHUB_ENV
|
||||
|
||||
DEVICE_ARCH=$(wget -q $PROFILE_URL -O- | tr ',' '\n' | grep "arch_packages"| awk -F: '{print $2}' | tr -d '"')
|
||||
echo "Device ARCH: $DEVICE_ARCH"
|
||||
echo "DEVICE_ARCH=$DEVICE_ARCH" >> $GITHUB_ENV
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
with:
|
||||
repository: openwrt/openwrt
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Checkout snapshot commit in openwrt repo
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: git checkout ${{ env.SNAPSHOT_COMMIT_SHA}}
|
||||
|
||||
- name: Building kernel and tools
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: |
|
||||
echo "pkgarch: ${{ matrix.build_env.pkgarch}}, target:${{ matrix.build_env.target}}, subtarget: ${{ matrix.build_env.subtarget}}"
|
||||
|
||||
# Setup & install feeds
|
||||
wget https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/feeds.buildinfo -O feeds.conf
|
||||
echo "src-git awgopenwrt https://github.com/Slava-Shchipunov/awg-openwrt.git" >> ./feeds.conf
|
||||
./scripts/feeds update && ./scripts/feeds install -a
|
||||
|
||||
# Setup config with AWG and dependencies
|
||||
wget https://downloads.openwrt.org/snapshots/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/config.buildinfo -O .config
|
||||
echo "CONFIG_PACKAGE_kmod-amneziawg=m" >> .config
|
||||
echo "CONFIG_PACKAGE_amneziawg-tools=y" >> .config
|
||||
echo "CONFIG_PACKAGE_luci-app-amneziawg=y" >> .config
|
||||
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20=m" >> .config
|
||||
echo "CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=m" >> .config
|
||||
echo "CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=m" >> .config
|
||||
|
||||
make defconfig
|
||||
|
||||
echo " > make tools/install"
|
||||
make tools/install -i -j `nproc`
|
||||
|
||||
cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
|
||||
|
||||
echo " > make toolchain/install"
|
||||
make toolchain/install -i -j `nproc`
|
||||
|
||||
cat ./build_dir/target-*/linux-*/linux-*/.vermagic || true
|
||||
|
||||
# compile kernel module
|
||||
echo " > make target/linux/compile"
|
||||
make target/linux/compile -i -j `nproc` V=s
|
||||
|
||||
VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
|
||||
VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
|
||||
|
||||
if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
|
||||
echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Build AmneziaWG
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: |
|
||||
VERMAGIC=`cat ./build_dir/target-*/linux-*/linux-*/.vermagic`
|
||||
echo "Vermagic: $VERMAGIC"
|
||||
|
||||
VERMAGIC_EXPECTED=${{ matrix.build_env.vermagic }}
|
||||
|
||||
if [ "$VERMAGIC" != "$VERMAGIC_EXPECTED" ]; then
|
||||
echo Vermagic mismatch: $VERMAGIC, expected $VERMAGIC_EXPECTED
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Ignore kmod build for some targets, replace with the awg-go
|
||||
make package/kmod-amneziawg/{clean,download,prepare} V=s || true
|
||||
make package/kmod-amneziawg/compile V=s || true
|
||||
|
||||
make package/luci-app-amneziawg/{clean,download,prepare}
|
||||
make package/luci-app-amneziawg/compile V=s
|
||||
|
||||
make V=s package/amneziawg-tools/{clean,download,prepare}
|
||||
make V=s package/amneziawg-tools/compile
|
||||
|
||||
- name: Prepare artifacts
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: |
|
||||
tag_name=${{ github.ref_name }}
|
||||
mkdir -p awgrelease
|
||||
postfix="${{ matrix.build_env.tag }}_${{ matrix.build_env.vermagic }}_${{ matrix.build_env.pkgarch}}_${{ matrix.build_env.target}}_${{ matrix.build_env.subtarget}}"
|
||||
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/amneziawg-tools_*.ipk awgrelease/amneziawg-tools_${postfix}.ipk
|
||||
cp bin/packages/${{ matrix.build_env.pkgarch }}/awgopenwrt/luci-app-amneziawg_*.ipk awgrelease/luci-app-amneziawg_${postfix}.ipk
|
||||
cp bin/targets/${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}}/packages/kmod-amneziawg_*.ipk awgrelease/kmod-amneziawg_${postfix}.ipk
|
||||
|
||||
- name: Delete old release assets
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
run: |
|
||||
postfix="${{ matrix.build_env.pkgarch }}_${{ matrix.build_env.target }}_${{ matrix.build_env.subtarget }}"
|
||||
echo "Looking for old release files ending with: ${postfix}"
|
||||
|
||||
# Получаем список всех артефактов релиза по имени
|
||||
assets=$(gh release view "${{ matrix.build_env.tag }}" --repo Slava-Shchipunov/awg-openwrt --json assets --jq ".assets | .[] | select(.name | endswith(\"$postfix.ipk\")) | .name")
|
||||
|
||||
# Удаляем найденные артефакты по имени
|
||||
for asset_name in $assets; do
|
||||
echo "Deleting asset with name: $asset_name"
|
||||
gh release delete-asset "${{ matrix.build_env.tag }}" "$asset_name" --repo Slava-Shchipunov/awg-openwrt
|
||||
done
|
||||
|
||||
- name: Release
|
||||
if: env.FILE_EXISTS == 'false'
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: awgrelease/*.ipk
|
||||
tag_name: ${{ matrix.build_env.tag }}
|
||||
46
index.js
46
index.js
@@ -3,16 +3,19 @@ const cheerio = require('cheerio');
|
||||
const core = require('@actions/core');
|
||||
|
||||
const version = process.argv[2]; // Получение версии OpenWRT из аргумента командной строки
|
||||
const filterTargetsStr = process.argv[3] || ''; // Фильтр по targets (опционально, через запятую)
|
||||
const filterSubtargetsStr = process.argv[4] || ''; // Фильтр по subtargets (опционально, через запятую)
|
||||
|
||||
const SNAPSHOT_TARGETS_TO_BUILD = ['mediatek', 'ramips', 'x86', 'armsr'];
|
||||
const SNAPSHOT_SUBTARGETS_TO_BUILD = ['filogic', 'mt7622', 'mt7623', 'mt7629', 'mt7620', 'mt7621', 'mt76x8', '64', 'generic', 'armv8'];
|
||||
// Преобразуем строки с запятыми в массивы
|
||||
const filterTargets = filterTargetsStr ? filterTargetsStr.split(',').map(t => t.trim()).filter(t => t) : [];
|
||||
const filterSubtargets = filterSubtargetsStr ? filterSubtargetsStr.split(',').map(s => s.trim()).filter(s => s) : [];
|
||||
|
||||
if (!version) {
|
||||
core.setFailed('Version argument is required');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const url = version === 'SNAPSHOT' ? 'https://downloads.openwrt.org/snapshots/targets/' : `https://downloads.openwrt.org/releases/${version}/targets/`;
|
||||
const url = `https://downloads.openwrt.org/releases/${version}/targets/`;
|
||||
|
||||
async function fetchHTML(url) {
|
||||
try {
|
||||
@@ -74,19 +77,38 @@ async function main() {
|
||||
const jobConfig = [];
|
||||
|
||||
for (const target of targets) {
|
||||
// Пропускаем target, если указан массив фильтров и target не входит в него
|
||||
if (filterTargets.length > 0 && !filterTargets.includes(target)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const subtargets = await getSubtargets(target);
|
||||
for (const subtarget of subtargets) {
|
||||
// Пропускаем subtarget, если указан массив фильтров и subtarget не входит в него
|
||||
if (filterSubtargets.length > 0 && !filterSubtargets.includes(subtarget)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Добавляем в конфигурацию только если:
|
||||
// 1. Оба массива пустые (автоматическая сборка по тегу) - собираем всё
|
||||
// 2. Оба массива НЕ пустые (ручной запуск) - target И subtarget должны быть в своих массивах
|
||||
const isAutomatic = filterTargets.length === 0 && filterSubtargets.length === 0;
|
||||
const isManualMatch = filterTargets.length > 0 && filterSubtargets.length > 0 &&
|
||||
filterTargets.includes(target) && filterSubtargets.includes(subtarget);
|
||||
|
||||
if (!isAutomatic && !isManualMatch) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const { vermagic, pkgarch } = await getDetails(target, subtarget);
|
||||
|
||||
if (version !== 'SNAPSHOT' || (SNAPSHOT_SUBTARGETS_TO_BUILD.includes(subtarget) && SNAPSHOT_TARGETS_TO_BUILD.includes(target))) {
|
||||
jobConfig.push({
|
||||
tag: version,
|
||||
target,
|
||||
subtarget,
|
||||
vermagic,
|
||||
pkgarch,
|
||||
});
|
||||
}
|
||||
jobConfig.push({
|
||||
tag: version,
|
||||
target,
|
||||
subtarget,
|
||||
vermagic,
|
||||
pkgarch,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user