ci: sync with librtui

Signed-off-by: ZHANG Yuntian <[email protected]>

Author: RadxaYuntian

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
               make build-dtbo -j$(nproc) KERNELRELEASE=5.10.110-11-rockchip CONFIG_ARCH_MESON=n CONFIG_CPU_RK3399=rockchip CONFIG_CPU_RK3568=rockchip CONFIG_CPU_RK3588=rockchip
               ;;
             linux-rk356x)
-              make build-dtbo -j$(nproc) KERNELRELEASE=5.10.160-7-rk356x CONFIG_ARCH_MESON=n CONFIG_CPU_RK3399=rockchip CONFIG_CPU_RK3568=rockchip CONFIG_CPU_RK3588=rockchip
+              make build-dtbo -j$(nproc) KERNELRELEASE=5.10.160-7-rk356x CONFIG_ARCH_MESON=n CONFIG_CPU_RK3399=rockchip CONFIG_CPU_RK3528=rockchip CONFIG_CPU_RK3568=rockchip CONFIG_CPU_RK3588=rockchip
               ;;
           esac
       - name: Upload artifacts

.github/workflows/release.yml

@@ -12,17 +12,22 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      distro: ${{ steps.distro_check.outputs.distro }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
+      - name: Test
+        run: |
+          make test
       - name: Build
         run: |
           sudo apt-get update
           sudo apt-get build-dep --no-install-recommends -y .
-          make deb
+          make all deb
       - name: Workaround actions/upload-artifact#176
         run: |
           echo "artifacts_path=$(realpath ..)" >> $GITHUB_ENV
@@ -32,10 +37,20 @@ jobs:
           name: ${{ github.event.repository.name }}
           path: |
             ${{ env.artifacts_path }}/*.deb
+      - name: Check if the latest version is releasable
+        id: distro_check
+        run: |
+          version="$(dpkg-parsechangelog -S Version)"
+          if [[ -n "$(git tag -l "$version")" ]]
+          then
+            echo "distro=UNRELEASED" >> "$GITHUB_OUTPUT"
+          else
+            echo "distro=$(dpkg-parsechangelog -S Distribution)" >> "$GITHUB_OUTPUT"
+          fi
   release:
     runs-on: ubuntu-latest
     needs: build
-    if: ${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}
+    if: ${{ github.event_name != 'pull_request' && needs.build.outputs.distro != 'UNRELEASED' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,7 +60,8 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: ${{ github.event.repository.name }}
-      - name: Check if the latest version is releasable
+          path: .artifacts
+      - name: Prepare for release
         run: |
           version="$(dpkg-parsechangelog -S Version)"
           echo "version=$version" >> $GITHUB_ENV
@@ -54,32 +70,25 @@ jobs:
           echo "$(dpkg-parsechangelog -S Changes)" >> $GITHUB_ENV
           echo '```' >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
-          if [[ -n "$(git tag -l "$version")" ]]
-          then
-            echo "distro=UNRELEASED" >> $GITHUB_ENV
-          else
-            echo "distro=$(dpkg-parsechangelog -S Distribution)" >> $GITHUB_ENV
-          fi
           echo "$version" > VERSION
           if [[ -f pkg.conf.template ]]
           then
             sed "s/VERSION/$(dpkg-parsechangelog -S Version)/g" pkg.conf.template > pkg.conf
           fi
       - name: Release
-        if: env.distro != 'UNRELEASED'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.version }}
           body_path: README.md
           token: ${{ secrets.GITHUB_TOKEN }}
-          target_commitish: master
+          target_commitish: ${{ github.ref_name }}
           draft: false
-          fail_on_unmatched_files: true
+          fail_on_unmatched_files: false
           files: |
-            *.deb
+            .artifacts/**/*.deb
+            pkg.conf
             VERSION
       - name: Append changelog
-        if: env.distro != 'UNRELEASED'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.version }}
@@ -88,7 +97,6 @@ jobs:
             ${{ env.changes }}
           append_body: true
       - name: Update Test repos
-        if: env.distro != 'UNRELEASED'
         uses: radxa-repo/update-repo-action@main
         with:
           test-repo: true

Makefile

@@ -15,6 +15,15 @@ DTBO-ROCKCHIP	:=	$(addprefix arch/arm64/boot/dts/rockchip/overlays/,$(dtb-rockch
 DTBO		:=	$(DTBO-AMLOGIC) $(DTBO-ROCKCHIP)
 TMP		:=	$(addsuffix .tmp,$(DTBO))
 
+.PHONY: all
+all: build
+
+#
+# Test
+#
+.PHONY: test
+test:
+
 #
 # Build
 #
@@ -55,9 +64,13 @@ clean: clean-dtbo
 # Release
 #
 .PHONY: dch
-dch: debian/changelog build-doc
-	EDITOR=true gbp dch --commit --debian-branch=main --release --dch-opt=--upstream
+dch: debian/changelog
+	EDITOR=true gbp dch --ignore-branch --multimaint-merge --commit --release --dch-opt=--upstream
 
 .PHONY: deb
-deb: debian build-doc
+deb: debian
 	debuild --no-lintian --lintian-hook "lintian --fail-on error,warning --suppress-tags bad-distribution-in-changes-file -- %p_%v_*.changes" --no-sign -b
+
+.PHONY: release
+release:
+	gh workflow run .github/workflows/new_version.yml --ref $(shell git branch --show-current)