Compare commits

...

44 Commits

Author SHA1 Message Date
Slava-Shchipunov
08db0f78ed fix: remove needs 2024-10-20 01:30:47 +07:00
Slava-Shchipunov
1cdb513a00 feat: add action to build to immortalwrt 2024-10-20 01:25:28 +07:00
Slava-Shchipunov
2de5a7406e Merge pull request #30 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-07 18:16:12 +07:00
Svyatoslav Shchipunov
727d873870 fix: fix run build job 2024-10-07 18:15:24 +07:00
Slava-Shchipunov
e538a4cd3b Merge pull request #29 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-07 18:10:12 +07:00
Svyatoslav Shchipunov
2d0ce4148d fix: fix run build job 2024-10-07 18:09:42 +07:00
Slava-Shchipunov
bdcc13cb62 Merge pull request #28 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 13:11:25 +07:00
Svyatoslav Shchipunov
f4361730a1 fix: fix run build job 2024-10-02 13:10:47 +07:00
Slava-Shchipunov
bde01b77c4 Merge pull request #27 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 13:02:21 +07:00
Svyatoslav Shchipunov
37f4fc71e2 fix: fix run build job 2024-10-02 13:01:50 +07:00
Slava-Shchipunov
12ffd61390 Merge pull request #26 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 12:57:24 +07:00
Svyatoslav Shchipunov
4dc8ea2b6a fix: fix run build job 2024-10-02 12:56:58 +07:00
Slava-Shchipunov
4add339eba Merge pull request #25 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 12:21:44 +07:00
Svyatoslav Shchipunov
e5696ca1e3 fix: fix run build job 2024-10-02 12:20:52 +07:00
Slava-Shchipunov
90508ad0b1 Merge pull request #24 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 12:15:20 +07:00
Svyatoslav Shchipunov
aec74cab7d fix: fix run build job 2024-10-02 12:14:53 +07:00
Slava-Shchipunov
9ae861fe88 Merge pull request #23 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 12:12:04 +07:00
Svyatoslav Shchipunov
77e16b164c fix: fix run build job 2024-10-02 12:11:12 +07:00
Slava-Shchipunov
0ac5434a63 Merge pull request #22 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 12:07:30 +07:00
Svyatoslav Shchipunov
9c44a73425 fix: fix run build job 2024-10-02 12:06:38 +07:00
Slava-Shchipunov
f8d852d9d7 Merge pull request #21 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix uses attribute
2024-10-02 11:46:08 +07:00
Svyatoslav Shchipunov
cd0e27204e fix: fix uses attribute 2024-10-02 11:45:42 +07:00
Slava-Shchipunov
09bbe44557 Merge pull request #20 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix uses attribute
2024-10-02 11:34:19 +07:00
Svyatoslav Shchipunov
811154ea36 fix: fix uses attribute 2024-10-02 11:33:53 +07:00
Slava-Shchipunov
b416e511c3 Merge pull request #19 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix run build job
2024-10-02 11:29:30 +07:00
Svyatoslav Shchipunov
66b6a8f7ce fix: fix run build job 2024-10-02 11:29:03 +07:00
Slava-Shchipunov
521f0626d2 Merge pull request #18 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix release art
2024-10-02 10:58:32 +07:00
Svyatoslav Shchipunov
47c3466084 fix: fix release art 2024-10-02 10:58:02 +07:00
Slava-Shchipunov
8b611ec73c Merge pull request #17 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix build run conditions
2024-10-02 10:53:41 +07:00
Svyatoslav Shchipunov
77ee2bf7cc fix: fix build run conditions 2024-10-02 10:52:39 +07:00
Slava-Shchipunov
3b8de3d5f8 Merge pull request #16 from Slava-Shchipunov/fix/fix-release-sync-workflow
Revert "fix: fix JSON parsing"
2024-10-02 10:33:41 +07:00
Svyatoslav Shchipunov
fa7bf7cfb0 Revert "fix: fix JSON parsing"
This reverts commit 8c467935c4.
2024-10-02 10:32:43 +07:00
Slava-Shchipunov
2b1de64324 Merge pull request #15 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix JSON parsing
2024-10-02 10:29:37 +07:00
Svyatoslav Shchipunov
8c467935c4 fix: fix JSON parsing 2024-10-02 10:29:11 +07:00
Svyatoslav Shchipunov
96b8dddbd1 fix: fix JSON parsing 2024-10-02 10:18:53 +07:00
Slava-Shchipunov
c7be95682f Merge pull request #14 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: add job output
2024-10-02 10:15:19 +07:00
Svyatoslav Shchipunov
128a6054c2 fix: add job output 2024-10-02 10:13:56 +07:00
Slava-Shchipunov
ef86be910a Merge pull request #13 from Slava-Shchipunov/fix/fix-release-sync-workflow
fix: fix job run condition
2024-10-02 10:08:53 +07:00
Svyatoslav Shchipunov
d0727b534e fix: fix job run condition 2024-10-02 10:02:44 +07:00
Slava-Shchipunov
e55641a754 Merge pull request #12 from Slava-Shchipunov/feat/update-gh-actions
feat: add target filter to snapshots
2024-09-23 10:36:19 +07:00
Slava-Shchipunov
e7c7d2d8a7 Merge pull request #11 from Slava-Shchipunov/feat/update-gh-actions
docs: update README
2024-09-20 17:34:45 +07:00
Slava-Shchipunov
1b130609a3 Merge pull request #10 from Slava-Shchipunov/feat/update-gh-actions
feat: add x86 generic
2024-09-20 15:27:09 +07:00
Slava-Shchipunov
78ee14fbf2 Merge pull request #9 from Slava-Shchipunov/feat/update-gh-actions
fix: fix art
2024-09-20 12:13:33 +07:00
Slava-Shchipunov
14397a5914 Merge pull request #8 from Slava-Shchipunov/feat/update-gh-actions
Feat/update gh actions
2024-09-20 11:42:59 +07:00
3 changed files with 213 additions and 13 deletions

View File

@@ -1,9 +1,14 @@
name: Create Release on Tag name: Create Release on Tag
# on: [workflow_dispatch]
on: on:
push: push:
tags: tags:
- "v*.*.*" - "v*.*.*"
workflow_call:
inputs:
tag_name:
required: true
type: string
jobs: jobs:
generate-config: generate-config:
@@ -21,7 +26,13 @@ jobs:
- name: Get OpenWRT version from tag - name: Get OpenWRT version from tag
id: get_version id: get_version
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV run: |
if [ "${{ github.event_name }}" == "workflow_call" ]; then
echo "VERSION=${{ inputs.tag_name }}" >> $GITHUB_ENV
echo "VERSION=${VERSION#v}" >> $GITHUB_ENV
else
echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
fi
- name: Install dependencies - name: Install dependencies
run: npm install run: npm install

View File

@@ -0,0 +1,171 @@
name: Build AmneziaWG for snapshot ImmortalWRT
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
on:
push:
tags:
- "SNAPSHOT-ImmortalWRT"
# schedule:
# - cron: '0 */4 * * *'
workflow_dispatch:
jobs:
build:
name: "${{ matrix.build_env.tag }} - ${{ matrix.build_env.pkgarch}} :: ${{ matrix.build_env.target}}/${{ matrix.build_env.subtarget}} build"
runs-on: ubuntu-latest
strategy:
matrix:
build_env:
- tag: "SNAPSHOT-ImmortalWRT"
pkgarch: "mipsel_24kc"
target: "ramips"
subtarget: "mt7621"
vermagic: "5a653f93e606afe42d18edcd614b1183"
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.immortalwrt.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: immortalwrt/immortalwrt
fetch-depth: 0
- name: Checkout snapshot commit in immortalwrt 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.immortalwrt.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.immortalwrt.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 }}

View File

@@ -8,6 +8,9 @@ on:
jobs: jobs:
sync-releases: sync-releases:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs:
release_exists: ${{ steps.check_release.outputs.release_exists }}
release_tag: ${{ steps.get_release.outputs.release_tag }}
steps: steps:
- name: Checkout your repo - name: Checkout your repo
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -24,25 +27,40 @@ jobs:
- name: Check if release exists in your repo - name: Check if release exists in your repo
id: check_release id: check_release
run: | run: |
curl -s https://api.github.com/repos/Slava-Shchipunov/awg-openwrt/releases/tags/${{ steps.get_release.outputs.release_tag }} | jq -r .tag_name || echo "Not found" RELEASE_EXISTS=$(curl -s https://api.github.com/repos/Slava-Shchipunov/awg-openwrt/releases/tags/${{ steps.get_release.outputs.release_tag }} | jq -r .tag_name)
if [ "$RELEASE_EXISTS" == "null" ]; then
echo "::set-output name=release_exists::false"
else
echo "::set-output name=release_exists::true"
fi
- name: Create release in your repo - name: Create release in your repo
if: steps.check_release.outputs.tag_name == 'Not found' if: steps.check_release.outputs.release_exists == 'false'
run: | run: |
ART=" ART="
\`\`\`
_______ ________ __ _______ ________ __
| |.-----.-----.-----.| | | |.----.| |_ | |.-----.-----.-----.| | | |.----.| |_
| - || _ | -__| || | | || _|| _| | - || _ | -__| || | | || _|| _|
|_______|| __|_____|__|__||________||__| |____| |_______|| __|_____|__|__||________||__| |____|
|__| A M N E Z I A W I R E G U A R D |__| A M N E Z I A W I R E G U A R D
----------------------------------------------------- -----------------------------------------------------
OpenWrt ${{ steps.get_release.outputs.release_tag }} OpenWrt ${{ steps.get_release.outputs.release_tag }}
-----------------------------------------------------" -----------------------------------------------------
\`\`\`"
curl -X POST https://api.github.com/repos/Slava-Shchipunov/awg-openwrt/releases \ curl -X POST https://api.github.com/repos/Slava-Shchipunov/awg-openwrt/releases \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{ -d "$(jq -n --arg tag "${{ steps.get_release.outputs.release_tag }}" \
"tag_name": "'${{ steps.get_release.outputs.release_tag }}'", --arg name "Build amnezia wg for all devices with openwrt ${{ steps.get_release.outputs.release_tag }}" \
"name": "Build amnezia wg for all devices with openwrt '${{ steps.get_release.outputs.release_tag }}'", --arg body "$ART" \
"body": "'"${ART}"'\n\nAutomatically created release for OpenWRT '${{ steps.get_release.outputs.release_tag }}'." '{ tag_name: $tag, name: $name, body: $body }')"
}'
run-build:
runs-on: ubuntu-latest
needs: sync-releases
if: needs.sync-releases.outputs.release_exists == 'false'
uses: Slava-Shchipunov/awg-openwrt/.github/workflows/build-module.yml@master
with:
tag_name: ${{ needs.sync-releases.outputs.release_tag }}