Fix Linux package tests and allow safe release build retries
This commit is contained in:
1 parent
9736aa82a8
commit
0400087b54
3 files changed
+39
-11
No files matched your search
@@ -8,6 +8,15 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths: ['files/**', 'package/**', 'scripts/*openwrt*', 'tests/test_openwrt_package.py', '.github/workflows/openwrt-packages.yml']
|
paths: ['files/**', 'package/**', 'scripts/*openwrt*', 'tests/test_openwrt_package.py', '.github/workflows/openwrt-packages.yml']
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
publish_release:
|
||||||
|
description: Attach successful builds to the existing version tag
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
release_tag:
|
||||||
|
description: Existing tag (empty means v plus PKG_VERSION)
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -23,6 +32,7 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
builds: ${{ steps.targets.outputs.builds }}
|
builds: ${{ steps.targets.outputs.builds }}
|
||||||
smoke: ${{ steps.targets.outputs.smoke }}
|
smoke: ${{ steps.targets.outputs.smoke }}
|
||||||
|
release_tag: ${{ steps.release.outputs.tag }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Test package tooling and shell syntax
|
- name: Test package tooling and shell syntax
|
||||||
@@ -30,17 +40,28 @@ jobs:
|
|||||||
python3 -m unittest discover -s tests -p test_openwrt_package.py -v
|
python3 -m unittest discover -s tests -p test_openwrt_package.py -v
|
||||||
sh -n scripts/build-openwrt-package.sh
|
sh -n scripts/build-openwrt-package.sh
|
||||||
sh -n package/luci-app-owrt-remote/root/usr/lib/owrt-remote/package.sh
|
sh -n package/luci-app-owrt-remote/root/usr/lib/owrt-remote/package.sh
|
||||||
- name: Validate tag against package version
|
- id: release
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
name: Validate release tag and source payload
|
||||||
env:
|
env:
|
||||||
RELEASE_TAG: ${{ github.ref_name }}
|
RELEASE_TAG: ${{ github.ref_type == 'tag' && github.ref_name || inputs.release_tag }}
|
||||||
|
MANUAL_PUBLISH: ${{ github.event_name == 'workflow_dispatch' && inputs.publish_release }}
|
||||||
|
PUBLISH_REQUESTED: ${{ startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && inputs.publish_release) }}
|
||||||
run: |
|
run: |
|
||||||
python3 - <<'PY'
|
python3 - <<'PY'
|
||||||
import os, sys
|
import os, subprocess, sys
|
||||||
sys.path.insert(0, 'scripts')
|
sys.path.insert(0, 'scripts')
|
||||||
import openwrt_package as p
|
import openwrt_package as p
|
||||||
if os.environ['RELEASE_TAG'] != 'v' + p.versions()[0]:
|
expected = 'v' + p.versions()[0]
|
||||||
|
tag = os.environ['RELEASE_TAG'] or expected
|
||||||
|
if os.environ['PUBLISH_REQUESTED'] == 'true' and tag != expected:
|
||||||
raise SystemExit('Release tag must match PKG_VERSION in package/luci-app-owrt-remote/Makefile')
|
raise SystemExit('Release tag must match PKG_VERSION in package/luci-app-owrt-remote/Makefile')
|
||||||
|
if os.environ['MANUAL_PUBLISH'] == 'true':
|
||||||
|
# Retry corrected build tooling without moving an existing tag.
|
||||||
|
# The application payload and package recipe must still match it.
|
||||||
|
subprocess.run(['git', 'fetch', '--no-tags', 'origin', 'tag', tag], check=True)
|
||||||
|
subprocess.run(['git', 'diff', '--exit-code', tag, 'HEAD', '--', 'files', 'package/luci-app-owrt-remote'], check=True)
|
||||||
|
with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
|
||||||
|
f.write('tag=' + tag + '\n')
|
||||||
PY
|
PY
|
||||||
- id: targets
|
- id: targets
|
||||||
name: Resolve latest maintenance versions for each supported series
|
name: Resolve latest maintenance versions for each supported series
|
||||||
@@ -129,8 +150,8 @@ jobs:
|
|||||||
|
|
||||||
publish:
|
publish:
|
||||||
name: Attach verified packages to GitHub Release
|
name: Attach verified packages to GitHub Release
|
||||||
needs: [build, install-test]
|
needs: [matrix, build, install-test]
|
||||||
if: startsWith(github.ref, 'refs/tags/v') && github.event_name != 'workflow_dispatch'
|
if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && inputs.publish_release)
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -151,7 +172,7 @@ jobs:
|
|||||||
while read -r name; do cp "$name" ../publish-files/; done < ../release-files.txt
|
while read -r name; do cp "$name" ../publish-files/; done < ../release-files.txt
|
||||||
- uses: softprops/action-gh-release@v2
|
- uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: ${{ github.ref_name }}
|
tag_name: ${{ needs.matrix.outputs.release_tag }}
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
fail_on_unmatched_files: true
|
fail_on_unmatched_files: true
|
||||||
files: |
|
files: |
|
||||||
|
|||||||
@@ -136,8 +136,12 @@ python3 scripts/openwrt_package.py prepare --output /path/to/sdk/package/luci-ap
|
|||||||
## GitHub Actions и подпись APK
|
## GitHub Actions и подпись APK
|
||||||
|
|
||||||
Workflow `.github/workflows/openwrt-packages.yml` запускается на тегах `v*`,
|
Workflow `.github/workflows/openwrt-packages.yml` запускается на тегах `v*`,
|
||||||
публикации Release, изменениях пакета в pull request и вручную. Вручную и в PR
|
публикации Release, изменениях пакета в pull request и вручную. В PR и при
|
||||||
он только собирает и тестирует; в Releases пишет только запуск по тегу.
|
обычном ручном запуске он только собирает и тестирует. Для повторной публикации
|
||||||
|
после исправления сборочного инструмента доступен ручной запуск с
|
||||||
|
`publish_release=true` и существующим `release_tag`, например `v121`.
|
||||||
|
Он не перемещает тег и проверяет, что содержимое `files/` и рецепт пакета
|
||||||
|
совпадают с этим тегом; затем прикладывает успешно проверенные пакеты к Release.
|
||||||
Тег должен совпадать с `PKG_VERSION`: текущий пример — `v121`.
|
Тег должен совпадать с `PKG_VERSION`: текущий пример — `v121`.
|
||||||
Следующий выпуск должен получить новую версию или пакетную ревизию в Makefile.
|
Следующий выпуск должен получить новую версию или пакетную ревизию в Makefile.
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import gzip
|
|||||||
import io
|
import io
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
@@ -106,7 +107,9 @@ class PackageTests(unittest.TestCase):
|
|||||||
helper = (p.RECIPE / "root/usr/lib/owrt-remote/package.sh").read_text()
|
helper = (p.RECIPE / "root/usr/lib/owrt-remote/package.sh").read_text()
|
||||||
# Redirect target paths in the harness. The production hook never
|
# Redirect target paths in the harness. The production hook never
|
||||||
# honors arbitrary ROOT/host variables supplied to a package manager.
|
# honors arbitrary ROOT/host variables supplied to a package manager.
|
||||||
helper = helper.replace("/etc/", target.as_posix() + "/etc/").replace("/tmp/", target.as_posix() + "/tmp/")
|
# One pass is essential on Linux: a temporary target itself starts
|
||||||
|
# with /tmp/, so sequential replacements would rewrite inserted paths.
|
||||||
|
helper = re.sub(r"/(?:etc|tmp)/", lambda match: target.as_posix() + match.group(0), helper)
|
||||||
result = subprocess.run([SH, "-s", "--", "configure"], input=helper, capture_output=True, text=True, env=self.env)
|
result = subprocess.run([SH, "-s", "--", "configure"], input=helper, capture_output=True, text=True, env=self.env)
|
||||||
return result, key, config
|
return result, key, config
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user