refactor: merge version and channel into one common field

Signed-off-by: Jérémy Audiger <jeremy.audiger@icloud.com>

Author: jaudiger

.github/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
         runs-on:
           - ubuntu-22.04
           - ubuntu-24.04
+          - ubuntu-latest
     runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Checkout repository
@@ -40,23 +41,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runs-on: ubuntu-latest
-            channel: stable
-          - runs-on: ubuntu-latest
-            channel: nightly
-          - runs-on: ubuntu-latest-arm
-            channel: stable
-          - runs-on: ubuntu-latest-arm
-            channel: nightly
+          - runs-on: ubuntu-24.04
+            version: stable
+          - runs-on: ubuntu-24.04
+            version: nightly
+          - runs-on: ubuntu-24.04-arm
+            version: stable
+          - runs-on: ubuntu-24.04-arm
+            version: nightly
     runs-on: ${{ matrix.runs-on }}
-    continue-on-error: ${{ matrix.runs-on == 'ubuntu-latest-arm' && matrix.channel == 'stable' }} # Brioche stable does not support ARM architecture
+    continue-on-error: ${{ matrix.runs-on == 'ubuntu-24.04-arm' && matrix.version == 'stable' }} # Brioche stable does not support ARM architecture
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
 
       - name: Setup Brioche
         uses: ./ # Uses an action in the root directory
         with:
-          channel: ${{ matrix.channel }}
+          version: ${{ matrix.version }}
 
       - *verify-brioche

README.md

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Brioche
         uses: brioche-dev/setup-brioche@v1
         with:
-          version: "v0.1.5"  # Optional, specify a version or use the default (latest)
+          version: "v0.1.5"  # Optional, specify a version or a release channel
           install-dir: '/custom/install/path'  # Optional, specify a custom installation path
 
       - name: Verify Brioche installation
@@ -32,8 +32,7 @@ jobs:
 
 ## Inputs
 
-- `version`: (Optional) The version of Brioche to install. Defaults to `latest`.
-- `channel`: (Optional) The channel to install from (stable or nightly).
+- `version`: (Optional) The version of Brioche to install. It can be either a specific version (`v0.1.5`) or a release channel (`stable`, `nightly`). Defaults to `stable`.
 - `install-dir`: (Optional) The directory where Brioche should be installed. Defaults to `$HOME/.local/bin`.
 - `install-apparmor`: (Optional) Enable or disable installation of an AppArmor profile for Brioche. Defaults to `auto`, which will automatically install it if required (e.g. on Ubuntu 24.04).
 
@@ -66,7 +65,7 @@ jobs:
       - name: Setup Brioche
         uses: brioche-dev/setup-brioche@v1
         # with:
-        #   version: "latest" # Optional
+        #   version: "stable" # Optional
         #   install-dir: "$HOME/custom/install/path" # Optional
 
       - name: Build package
@@ -85,7 +84,6 @@ This Action uses GitHub's [logging groups](https://docs.github.com/en/actions/us
 ## Troubleshooting
 
 - Ensure the version specified in the `version` input is valid and available.
-- Ensure `version` is not set when `channel=nightly` is specified.
 - If Brioche isn't recognized in your shell, make sure the install path is correctly set in your environment.
 
 ## License

action.yml

@@ -6,11 +6,7 @@ branding:
   icon: "box"
 inputs:
   version:
-    description: "Version of Brioche to install"
-    required: false
-    default: "latest"
-  channel:
-    description: "Channel of Brioche to install"
+    description: "Version of Brioche to install. It can be either a specific version ('v0.1.5') or a release channel ('stable', 'nightly'). Defaults to 'stable'"
     required: false
     default: "stable"
   install-dir:
@@ -31,5 +27,4 @@ runs:
       env:
         install_dir: ${{ inputs.install-dir }}
         version: ${{ inputs.version }}
-        channel: ${{ inputs.channel }}
         install_apparmor: ${{ inputs.install-apparmor }}

install-brioche.sh

@@ -2,6 +2,7 @@
 set -euo pipefail
 
 LATEST_BRIOCHE_VERSION="v0.1.5"
+SEMVER_REGEX='^v(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:\.(?:0|[1-9]\d*))?(?:-(?:(?:[0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?:[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
 
 # Based on the official install script here:
 # https://github.com/brioche-dev/brioche.dev/blob/main/public/install.sh
@@ -16,29 +17,25 @@ validate_inputs() {
         echo '::error::$HOME must be set'
         exit 1
     fi
-    if [ -z "${install_dir:-}" -o -z "${version:-}" -o -z "${channel:-}" -o -z "${install_apparmor:-}" ]; then
-        echo '::error::$install_dir, $version, $channel, and $install_apparmor must be set'
+    if [ -z "${install_dir:-}" -o -z "${version:-}" -o -z "${install_apparmor:-}" ]; then
+        echo '::error::$install_dir, $version, and $install_apparmor must be set'
         exit 1
     fi
 
-    # Validate channel constraints:
-    # - Only values `stable`, `nightly` are allowed
-    # - `version` and `channel=nightly` can't be used together, except when 'version=latest'
-    case "$channel" in
-        stable)
-            # Ensure 'latest' is replaced with the actual latest version
-            if [ "$version" == "latest" ]; then
-                version=$LATEST_BRIOCHE_VERSION
-            fi
-            ;;
-        nightly)
-            if [ "$version" != "latest" ]; then
-                echo "::error::version and channel=nightly can't be used together"
+    # Validate version constraints:
+    # - Only semver versions are allowed for version
+    # - Only values `stable`, `nightly` are allowed for release channel
+    case "$version" in
+        v*)
+            if [[ ! $version =~ $SEMVER_REGEX ]]; then
+                echo "::error::version must be a valid semver"
                 exit 1
             fi
             ;;
+        stable|nightly)
+            ;;
         *)
-            echo "::error::channel must be either 'stable' or 'nightly'"
+            echo "::error::version must be either 'stable', 'nightly' or a semver"
             exit 1
             ;;
     esac
@@ -77,10 +74,14 @@ install_brioche() {
     # Get the OS and architecture-specific config, such as download URL and AppArmor config
     case "$OSTYPE" in
         linux*)
-            case "$(uname -m) $channel" in
-                "x86_64 stable")
+            # aarch64 is not currently supported on stable
+            case "$(uname -m) $version" in
+                "x86_64 v"*)
                     brioche_url="https://releases.brioche.dev/$version/x86_64-linux/brioche"
                     ;;
+                "x86_64 stable")
+                    brioche_url="https://releases.brioche.dev/$LATEST_BRIOCHE_VERSION/x86_64-linux/brioche"
+                    ;;
                 "x86_64 nightly")
                     brioche_url="https://development-content.brioche.dev/github.com/brioche-dev/brioche/branches/main/x86_64-linux/brioche"
                     ;;
@@ -90,7 +91,6 @@ install_brioche() {
                 *)
                     echo "::error::Sorry, Brioche isn't currently supported on your architecture"
                     echo "  Detected architecture: $(uname -m)"
-                    echo "  Channel: $channel"
                     exit 1
                     ;;
             esac