Add Brioche nightly support #11
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,11 @@ inputs: | |
| version: | ||
| description: "Version of Brioche to install" | ||
| required: false | ||
| default: "latest" | ||
| channel: | ||
| description: "Channel of Brioche to install" | ||
| required: false | ||
| default: "stable" | ||
| install-dir: | ||
| description: "Directory where Brioche should be installed" | ||
| required: false | ||
|
|
@@ -27,4 +31,5 @@ runs: | |
| env: | ||
| install_dir: ${{ inputs.install-dir }} | ||
| version: ${{ inputs.version }} | ||
| channel: ${{ inputs.channel }} | ||
| install_apparmor: ${{ inputs.install-apparmor }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| LATEST_BRIOCHE_VERSION="v0.1.5" | ||
|
|
||
| # Based on the official install script here: | ||
| # https://github.com/brioche-dev/brioche.dev/blob/main/public/install.sh | ||
|
|
||
|
|
@@ -14,10 +16,32 @@ 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' | ||
| 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" | ||
| exit 1 | ||
| fi | ||
| ;; | ||
| *) | ||
| echo "::error::channel must be either 'stable' or 'nightly'" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| install_brioche() { | ||
|
|
@@ -33,7 +57,7 @@ install_brioche() { | |
| # Get each referenced env var, and validate each one is not empty | ||
| envsubst -v "$install_dir" | while read -r env_var; do | ||
| if [ -z "${!env_var:-}" ]; then | ||
| echo "::error::env var \$${env_var} is not set (used in \$install_dir)" | ||
| exit 1 | ||
| fi | ||
| done | ||
|
|
@@ -43,7 +67,7 @@ install_brioche() { | |
|
|
||
| # Ensure the result is not empty | ||
| if [ -z "$install_dir" ]; then | ||
| echo '::error::$install_dir expanded to empty string' | ||
| exit 1 | ||
| fi | ||
|
|
||
|
|
@@ -53,13 +77,20 @@ 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") | ||
| brioche_url="https://releases.brioche.dev/$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" | ||
| ;; | ||
| "aarch64 nightly") | ||
| brioche_url="https://development-content.brioche.dev/github.com/brioche-dev/brioche/branches/main/aarch64-linux/brioche" | ||
| ;; | ||
| *) | ||
| echo "::error::Sorry, Brioche isn't currently supported on your architecture" | ||
| echo " Detected architecture: $(uname -m)" | ||
| echo " Channel: $channel" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just found out that GitHub Actions doesn't seem to support
ubuntu-latest-arm(and they don't plan to add it). I think that's kinda annoying... so it seems sensible to just use a specific Ubuntu version for each of these jobs (we could keep usingubuntu-latestbut to keep it symmetric I'd lean towards keeping all of them pinned together)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I updated it in c4060fa. And I took the opportunity to re-add
ubuntu-latestin the matrix of the smoke test