diff --git a/.github/workflows/dorothy-workflow.yml b/.github/workflows/dorothy-workflow.yml index 7be0d0bdf..c52e113d4 100644 --- a/.github/workflows/dorothy-workflow.yml +++ b/.github/workflows/dorothy-workflow.yml @@ -109,8 +109,14 @@ jobs: - name: 'Trunk Check' shell: bash -leo pipefail {0} run: dorothy check - homebrew-macos-test: - runs-on: macos-latest + # https://github.com/actions/runner-images?tab=readme-ov-file#available-images + runner-test: + strategy: + fail-fast: false + matrix: + runner: [ubuntu-24.04, ubuntu-22.04, macos-14, macos-12] + # ubuntu-20.04 not supported, echo-wait fails: https://github.com/bevry/dorothy/actions/runs/9705310169/job/26787151094#step:2:1346 + runs-on: ${{ matrix.runner }} steps: - name: 'Dorothy Test' env: @@ -119,7 +125,11 @@ jobs: # ensure dorothy is cloned, and run command bash -c "$(curl -fsSL 'https://dorothy.bevry.me/run?slug=${{ github.repository }}&commit=${{ github.sha }}')" -- dorothy test fresh-macos-test: - runs-on: macos-latest + strategy: + fail-fast: false + matrix: + runner: [macos-14, macos-12] + runs-on: ${{ matrix.runner }} steps: - name: 'Uninstall Homebrew' run: | @@ -131,10 +141,10 @@ jobs: run: | # ensure dorothy is cloned, and run command bash -c "$(curl -fsSL 'https://dorothy.bevry.me/run?slug=${{ github.repository }}&commit=${{ github.sha }}')" -- dorothy test - distro-test: - continue-on-error: true + container-test: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: container: - 'ubuntu:latest' # https://hub.docker.com/_/ubuntu diff --git a/commands.beta/ytd-helper b/commands.beta/ytd-helper index fb67aa6f6..1858af48d 100755 --- a/commands.beta/ytd-helper +++ b/commands.beta/ytd-helper @@ -55,7 +55,7 @@ function ytd_helper() ( Helper for interacting with [youtube-dl] and its clones. Wraps with custom flags for common tasks. USAGE: - ytd-helper [...options] [-- [... tool options]] + ytd-helper [...options] -- ... [... tool options] OPTIONS: @@ -118,7 +118,7 @@ function ytd_helper() ( # Action # arguments - local item tool='' url='' + local item tool='' while test "$#" -ne 0; do item="$1" shift @@ -214,13 +214,7 @@ function ytd_helper() ( break ;; '--'*) help "An unrecognised flag was provided: $item" ;; - *) - if test -z "$url"; then - url="$item" - else - help "An unrecognised argument was provided: $item" - fi - ;; + *) help "An unrecognised argument was provided: $item" ;; esac done @@ -245,9 +239,6 @@ function ytd_helper() ( fi cmd=("$tool" "${cmd[@]}") - # handle url - cmd+=("$url") - # ===================================== # Action diff --git a/commands/setup-mac-brew b/commands/setup-mac-brew index b53391ee8..6d6324586 100755 --- a/commands/setup-mac-brew +++ b/commands/setup-mac-brew @@ -20,8 +20,9 @@ function setup_mac_brew() ( 'homebrew/core' 'homebrew/cask' # deprecated - 'caskroom/cask' # replaced by 'homebrew/cask' - 'caskroom/fonts' # replaced by 'homebrew/cask-fonts' + 'caskroom/cask' # replaced by 'homebrew/cask' + 'caskroom/fonts' # replaced by 'homebrew/cask-fonts' + 'homebrew/cask-fonts' # fonts mainlined https://github.com/ryanoasis/nerd-fonts/issues/1635#issue-2296375213 ) local HOMEBREW_TAPS=() local HOMEBREW_FORMULAS=() @@ -64,9 +65,6 @@ function setup_mac_brew() ( # add essentials HOMEBREW_TAPS+=( - # The fonts tap, is used by HOMEBREW_FONTS - 'homebrew/cask-fonts' - # the ffmpeg tap includes all the options, and is used later # https://github.com/homebrew-ffmpeg/homebrew-ffmpeg # https://trac.ffmpeg.org/wiki/CompilationGuide/macOS#Additionaloptions