Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use v0.1.7.0-rc1 #34

Merged
merged 4 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
steps:
- name: Extract the tested GHC versions
id: set-matrix
uses: kleidukos/get-tested@f111f862f481884c26faa691de3c51ae110cc766
uses: kleidukos/get-tested@801427dce20b9b9247b70ef9bf414964ca8bbcda
with:
cabal-file: get-tested.cabal
ubuntu: true
version: 0.1.6.0
ubuntu-version: latest
version: 0.1.7.0-rc1
tests:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
needs: generate-matrix
Expand Down
35 changes: 24 additions & 11 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ inputs:
description: "(legacy) Enable Windows runner, latest version"
required: false
default: false
windows-version:
windows-version:
description: "Enable Windows runner. If both `windows` and `windows-version` inputs are set, the explicit version will take priority"
required: false
default: ""
macos:
description: "(legacy) Enable macOS runner, latest version"
required: false
default: false
macos-version:
macos-version:
description: "Enable macOS runner. If both `macos` and `macos-version` inputs are set, the explicit version will take priority"
required: false
default: ""
Expand Down Expand Up @@ -49,28 +49,41 @@ runs:
wget -q https://github.com/Kleidukos/get-tested/releases/download/v${{ inputs.version }}/get-tested-${{ inputs.version }}-linux-amd64 -O get-tested
chmod +x get-tested

if [[ -n ${{ inputs.windows-version}} ]]
echo "::debug:: macOS: ${{ inputs.macos-version }}"
echo "::debug:: windows: ${{ inputs.windows-version }}"
echo "::debug:: ubuntu: ${{ inputs.ubuntu-version }}"

if [[ "${{ inputs.windows-version }}" != "" ]]
then
echo "::debug:: Windows explicit enabled: ${{ inputs.windows-version }}"
then echo "WINDOWS=\"--windows-version=${{ inputs.windows-version }}\"" >> $GITHUB_ENV
echo "WINDOWS=--windows-version=${{ inputs.windows-version }}" >> $GITHUB_ENV
elif [[ ${{ inputs.windows }} == "true" ]]
then
echo "::debug:: Windows fallback enabled: ${{ inputs.windows }}"
then echo "WINDOWS=--windows" >> $GITHUB_ENV
echo "WINDOWS=--windows" >> $GITHUB_ENV
else echo "WINDOWS=" >> $GITHUB_ENV
fi

if [[ ${{ -n inputs.macos-version}} ]]
if [[ "${{ inputs.macos-version }}" != "" ]]
then
echo "::debug:: macOS explicit version enabled: ${{ inputs.macos-version }}"
then echo "MACOS=\"--macos-version=${{ inputs.macos-version }}\"" >> $GITHUB_ENV
echo "MACOS=--macos-version=${{ inputs.macos-version }}" >> $GITHUB_ENV
elif [[ ${{ inputs.macos }} == "true" ]]
then
echo "::debug:: macOS fallback enabled: ${{ inputs.macos }}"
then echo "MACOS=--macos" >> $GITHUB_ENV
echo "MACOS=--macos" >> $GITHUB_ENV
else echo "MACOS=" >> $GITHUB_ENV
fi

if [[ ${{ -n inputs.ubuntu-version}} ]]
if [[ "${{ inputs.ubuntu-version }}" != "" ]]
then
echo "::debug:: Ubuntu explicit version enabled: ${{ inputs.ubuntu-version }}"
then echo "UBUNTU=\"--ubuntu-version=${{ inputs.ubuntu-version }}\"" >> $GITHUB_ENV
echo "UBUNTU=--ubuntu-version=${{ inputs.ubuntu-version }}" >> $GITHUB_ENV
elif [[ ${{ inputs.ubuntu }} == "true" ]]
then
echo "::debug:: Ubuntu fallback enabled: ${{ inputs.ubuntu }}"
then echo "UBUNTU=--ubuntu" >> $GITHUB_ENV
echo "UBUNTU=--ubuntu" >> $GITHUB_ENV
else echo "UBUNTU=" >> $GITHUB_ENV
fi

- name: Extract the tested GHC versions
Expand Down
12 changes: 6 additions & 6 deletions app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ module Main where
import Data.Aeson qualified as Aeson
import Data.ByteString.Lazy (ByteString)
import Data.ByteString.Lazy.Char8 qualified as ByteString
import Data.Text (Text)
import Data.Text.Display (display)
import Data.Vector (Vector)
import Data.Vector qualified as Vector
import Effectful
import Effectful.Error.Static
import Options.Applicative
import System.Exit
import Data.Text (Text)
import Data.Text.Display (display)
import Data.Vector (Vector)

import Extract
import Types
import Data.Version (showVersion)
import Extract
import Paths_get_tested (version)
import Types

data Options = Options
{ path :: FilePath
Expand Down Expand Up @@ -51,7 +51,7 @@ parseOptions =
<*> optional (strOption (long "ubuntu-version" <> metavar "VERSION" <> help "Enable the Ubuntu runner with the selected version"))
<*> switch (long "windows" <> help "(legacy) Enable the Windows runner's latest version")
<*> optional (strOption (long "windows-version" <> metavar "VERSION" <> help "Enable the Windows runner with the selected version"))
<**> simpleVersioner (showVersion version)
<**> simpleVersioner (showVersion version)

runOptions :: Options -> Eff [Error ProcessingError, IOE] ByteString
runOptions options = do
Expand Down
Binary file removed get-tested
Binary file not shown.
2 changes: 1 addition & 1 deletion get-tested.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ executable get-tested

other-modules:
Extract
Types
Paths_get_tested
Types

build-depends:
, aeson ^>=2.1
Expand Down
Loading