diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 46958e3..4515b4a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: test-bot: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [macos-latest] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -41,4 +41,4 @@ jobs: uses: actions/upload-artifact@main with: name: bottles - path: '*.bottle.*' + path: "*.bottle.*" diff --git a/Formula/fission-cli.rb b/Formula/fission-cli.rb index 4800c25..32f685f 100644 --- a/Formula/fission-cli.rb +++ b/Formula/fission-cli.rb @@ -12,9 +12,9 @@ class FissionCli < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "4944310619cbcc19bb8ada248d10858bf490ca96c26a3d2b86a4cf937d7c9397" end - depends_on "ghc" => :build + depends_on "ghc@8.10" => :build depends_on "haskell-stack" => :build - depends_on "openssl" + depends_on "openssl@1.1" uses_from_macos "ncurses" uses_from_macos "zlib" @@ -23,9 +23,12 @@ def install system "stack", "install", "--system-ghc", "--no-install-ghc", "--skip-ghc-check", "--local-bin-path=#{bin}", "--no-nix", "fission-cli:fission" - (bash_completion/"fission").write `#{bin}/fission --bash-completion-script #{bin}/fission` - (fish_completion/"fission.fish").write `#{bin}/fission --fish-completion-script #{bin}/fission` - (zsh_completion/"_fission").write `#{bin}/fission --zsh-completion-script #{bin}/fission` + generate_completions_from_executable(bin/"fission", "--bash-completion-script", bin/"fission", + shells: [:bash], shell_parameter_format: none) + generate_completions_from_executable(bin/"fission", "--fish-completion-script", bin/"fission", + shells: [:fish], shell_parameter_format: none) + generate_completions_from_executable(bin/"fission", "--zsh-completion-script", bin/"fission", + shells: [:zsh], shell_parameter_format: none) end test do