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

CI: upgrade fsxc to 0.6.0 #289

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

env:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
FSXC_VERSION: 0.5.9.1
FSXC_VERSION: 0.6.1--date20240905-0811.git-6158a3a

# FIXME: figure out why we need to clean after make if we
# want 'make strict' target to really happen without
Expand Down
1 change: 0 additions & 1 deletion scripts/downgradeMono.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ open System.IO

#if !LEGACY_FRAMEWORK
failwith "This script is not prepared yet for dotnet6 or higher, it assumes old mono is installed. If you intended to use this for mono, then run it with fsharpi --define:LEGACY_FRAMEWORK instead of dotnet fsi."
0
#else
#r "System.Configuration"
open System.Configuration
Expand Down
1 change: 0 additions & 1 deletion scripts/downloadUbuntuDeps.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ open System.IO

#if !LEGACY_FRAMEWORK
failwith "This script is not prepared yet for dotnet6 or higher, it uses old mono packages such as 'fsharp'. If you intended to use this for mono, then run it with fsharpi --define:LEGACY_FRAMEWORK instead of dotnet fsi."
0
#else
#r "System.Configuration"
open System.Configuration
Expand Down
7 changes: 4 additions & 3 deletions scripts/sanitycheck.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ module MapHelper =
map |> Map.toSeq |> Seq.map fst

let MergeIntoMap<'K,'V when 'K: comparison> (from: seq<'K*'V>): Map<'K,seq<'V>> =
let keys = from.Select (fun (k, v) -> k)
let keys = from.Select (fun (k, _v) -> k)
let keyValuePairs =
seq {
for key in keys do
let valsForKey = (from.Where (fun (k, v) -> key = k)).Select (fun (k, v) -> v) |> seq
let valsForKey = (from.Where (fun (k, _v) -> key = k)).Select (fun (_k, v) -> v) |> seq
yield key,valsForKey
}
keyValuePairs |> Map.ofSeq
Expand Down Expand Up @@ -288,7 +288,8 @@ let SanityCheckNugetPackages () =
yield packageDirNameThatShouldExist, prjs
} |> Map.ofSeq

let findExcessPackageDirs (solDir: DirectoryInfo) (idealPackageDirs: Map<string,seq<DependencyHolder>>): seq<string> =
// unused for now, we might use it later
let _findExcessPackageDirs (solDir: DirectoryInfo) (idealPackageDirs: Map<string,seq<DependencyHolder>>): seq<string> =
solDir.Refresh ()
if not (FsxHelper.NugetSolutionPackagesDir.Exists) then
failwithf "'%s' subdir under solution dir %s doesn't exist, run `make` first"
Expand Down
Loading