Update CI

radxa-build · Dec 1, 2023 · b754aee · b754aee
1 parent 34315e4
commit b754aee
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 62 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,12 +2,19 @@ name: Build image for Release channel
 on:
   workflow_dispatch:
 
+env:
+  GH_TOKEN: ${{ github.token }}
+
 jobs:
   prepare_release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Generate rbuild changelog
+        uses: radxa-repo/rbuild-changelog@main
+        with:
+          product: radxa-cm3-io
       - name: Create empty release
         id: release
         uses: softprops/action-gh-release@v1
@@ -18,6 +25,7 @@ jobs:
           target_commitish: main
           draft: false
           prerelease: true
+          files: .changelog/changelog.md
     outputs:
       release_id: ${{ steps.release.outputs.id }}
   build:
@@ -29,44 +37,24 @@ jobs:
         build_systems: [rbuild]
         distros: [debian, ubuntu]
         flavors: [kde, xfce, cli]
-        exclude:
-          - build_systems: debos
-            distros: debian
-            flavors: cli
-          - build_systems: debos
-            distros: ubuntu
-            flavors: kde
-          - build_systems: armbian
-            flavors: xfce
-          - build_systems: debos
-            flavors: xfce
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Upload Armbian image
-        uses: radxa/armbian-compile-action@main
-        if: matrix.build_systems == 'armbian'
-        with:
-          board: ${{ matrix.boards }}
-          distro: ${{ matrix.distros }}
-          flavor: ${{ matrix.flavors }}
-          release-id: ${{ needs.prepare_release.outputs.release_id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload debos-radxa image
-        uses: radxa/debos-build-action@main
-        if: matrix.build_systems == 'debos'
+        uses: actions/checkout@v4
+      - name: Upload rbuild image
+        uses: radxa-repo/rbuild@main
+        if: matrix.build_systems == 'rbuild' && matrix.distros != 'buster'
         with:
           board: ${{ matrix.boards }}
           distro: ${{ matrix.distros }}
           flavor: ${{ matrix.flavors }}
           release-id: ${{ needs.prepare_release.outputs.release_id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload rbuild image
+      - name: Upload rbuild legacy image
         uses: radxa-repo/rbuild@main
-        if: matrix.build_systems == 'rbuild'
+        if: matrix.build_systems == 'rbuild' && matrix.distros == 'buster'
         with:
           board: ${{ matrix.boards }}
-          distro: ${{ matrix.distros }}
+          suite: ${{ matrix.distros }}
           flavor: ${{ matrix.flavors }}
           release-id: ${{ needs.prepare_release.outputs.release_id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,12 +2,19 @@ name: Build image for Test channel
 on:
   workflow_dispatch:
 
+env:
+  GH_TOKEN: ${{ github.token }}
+
 jobs:
   prepare_release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - name: Generate rbuild changelog
+        uses: radxa-repo/rbuild-changelog@main
+        with:
+          product: radxa-cm3-io
       - name: Create empty release
         id: release
         uses: softprops/action-gh-release@v1
@@ -20,6 +27,7 @@ jobs:
           target_commitish: main
           draft: false
           prerelease: true
+          files: .changelog/changelog.md
     outputs:
       release_id: ${{ steps.release.outputs.id }}
   build:
@@ -31,44 +39,26 @@ jobs:
         build_systems: [rbuild]
         distros: [debian, ubuntu]
         flavors: [kde, xfce, cli]
-        exclude:
-          - build_systems: debos
-            distros: debian
-            flavors: cli
-          - build_systems: debos
-            distros: ubuntu
-            flavors: kde
-          - build_systems: armbian
-            flavors: xfce
-          - build_systems: debos
-            flavors: xfce
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Upload Armbian image
-        uses: radxa/armbian-compile-action@main
-        if: matrix.build_systems == 'armbian'
-        with:
-          board: ${{ matrix.boards }}
-          distro: ${{ matrix.distros }}
-          flavor: ${{ matrix.flavors }}
-          release-id: ${{ needs.prepare_release.outputs.release_id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload debos-radxa image
-        uses: radxa/debos-build-action@main
-        if: matrix.build_systems == 'debos'
+        uses: actions/checkout@v4
+      - name: Upload rbuild image
+        uses: radxa-repo/rbuild@main
+        if: matrix.build_systems == 'rbuild' && matrix.distros != 'buster'
         with:
           board: ${{ matrix.boards }}
           distro: ${{ matrix.distros }}
           flavor: ${{ matrix.flavors }}
           release-id: ${{ needs.prepare_release.outputs.release_id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload rbuild image
+          test-repo: true
+          timestamp: test-build-${{ github.run_number }}
+      - name: Upload rbuild legacy image
         uses: radxa-repo/rbuild@main
-        if: matrix.build_systems == 'rbuild'
+        if: matrix.build_systems == 'rbuild' && matrix.distros == 'buster'
         with:
           board: ${{ matrix.boards }}
-          distro: ${{ matrix.distros }}
+          suite: ${{ matrix.distros }}
           flavor: ${{ matrix.flavors }}
           release-id: ${{ needs.prepare_release.outputs.release_id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -9,16 +9,18 @@ Not all images are officially supported by Radxa. Some of them are only provided
 
 ## What images are provided?
 
-Currently the following images are provided:
-* Radxa [`rbuild`](https://github.com/radxa-repo/rbuild) images (currently testing)
+Currently 4 flavors are provided:
 
-## Is there any other options?
+- Debian KDE: This flavor is officially supported, tested, and recommended for all users.
+- Debian CLI: This flavor is officially supported. This flavor is quite minimal and is intended for headless usage. We do not support desktop usage on top of this flavor.
+- Ubuntu KDE: This flavor is provided as-is except for critical issues. Desktop is currently not working and we intend to fix it in a later time. This (currently broken) build is generated to catch build system issues.
+- Ubuntu CLI: This flavor is provided as-is except for critical issues. Users should look at Debian CLI as an alternative.
 
-Please visit [our Wiki](https://wiki.radxa.com/Rock3/downloads) for more download options.
+Please also always use [the latest release](https://github.com/radxa-build/radxa-cm3-io/releases/latest) instead of any pre-release / test builds. Those will not be supported.
 
-## Where can I download the Radxa image?
+## Is there any other options?
 
-Every month new images are [built](https://github.com/radxa-build/radxa-cm3-io/actions/workflows/build.yml) and [published](https://github.com/radxa-build/radxa-cm3-io/releases) as pre-releases, which serve as release candidates (RC). Radxa will periodically select an RC for additional testing, and once it passes those tests, promote it as an officially supported release. This is why you are always recommended to use [the latest release](https://github.com/radxa-build/radxa-cm3-io/releases/latest).
+Please visit [our Wiki](https://wiki.radxa.com/Rock3/downloads) for more download options.
 
 ## Help! Something doesn't work!