Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4a393d2

Browse files
xperiandrixperiandri
authoredFeb 22, 2020
Merge pull request #2 from vilinski/github-actions
GitHub actions
2 parents e989b53 + 29ff0a3 commit 4a393d2

File tree

17 files changed

+100
-71
lines changed

17 files changed

+100
-71
lines changed
 

‎.github/workflows/build.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: .NET Core
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- master
7+
- develop
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
- name: Build with dotnet
19+
run: |
20+
DOTNET_CLI_TELEMETRY_OPTOUT=1
21+
dotnet build --nologo --configuration Release

‎.github/workflows/publish_ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: publish to MyGet
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Setup .NET Core
16+
uses: actions/setup-dotnet@v1
17+
- name: Build with dotnet
18+
run: |
19+
sed -i "s|<Version>\(.*\)</Version>|<Version>\1-ci-$GITHUB_RUN_ID</Version>|" src/FSharp.Collections.Immutable/FSharp.Collections.Immutable.fsproj
20+
dotnet pack --nologo --configuration Release -o nuget
21+
- name: MyGet push
22+
run: |
23+
source=https://www.myget.org/F/fsharp-collections-immutable/api/v3/index.json
24+
key=${{secrets.MyGet_Key}}
25+
dotnet nuget push -s $source -k $key nuget/*.nupkg

‎.github/workflows/publish_release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: publish to NuGet
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
publish:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
# Required for a specific dotnet version that doesn't come with ubuntu-latest / windows-latest
17+
# Visit bit.ly/2synnZl to see the list of SDKs that are pre-installed with ubuntu-latest / windows-latest
18+
# - name: Setup dotnet
19+
# uses: actions/setup-dotnet@v1
20+
# with:
21+
# dotnet-version: 3.1.100
22+
23+
# Publish
24+
- name: publish on version change
25+
uses: rohith/publish-nuget@v2
26+
with:
27+
PROJECT_FILE_PATH: src/FSharp.Collections.Immutable/FSharp.Collections.Immutable.fsproj # Relative to repository root
28+
# VERSION_FILE_PATH: Directory.Build.props # Filepath with version info, relative to repository root. Defaults to project file
29+
# VERSION_REGEX: <Version>(.*)<\/Version> # Regex pattern to extract version info in a capturing group
30+
# TAG_COMMIT: true # Flag to enable / disalge git tagging
31+
# TAG_FORMAT: v* # Format of the git tag, [*] gets replaced with version
32+
NUGET_KEY: ${{secrets.NuGet_Key}}

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,5 @@ FakesAssemblies/
215215
GeneratedArtifacts/
216216
_Pvt_Extensions/
217217
ModelManifest.xml
218+
.ionide/
219+
.idea/

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable.sln renamed to ‎FSharp.Collections.Immutable.sln

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 16
43
VisualStudioVersion = 16.0.29021.104
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.Collections.Immutable", "FSharp.Collections.Immutable\FSharp.Collections.Immutable.fsproj", "{B5206296-9F17-41D9-809B-6B42DF529852}"
5+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Collections.Immutable", "src\FSharp.Collections.Immutable\FSharp.Collections.Immutable.fsproj", "{9805E74C-D028-4D05-9256-5C2FDC9B6EA8}"
76
EndProject
87
Global
98
GlobalSection(SolutionConfigurationPlatforms) = preSolution
109
Debug|Any CPU = Debug|Any CPU
1110
Release|Any CPU = Release|Any CPU
1211
EndGlobalSection
1312
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{B5206296-9F17-41D9-809B-6B42DF529852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{B5206296-9F17-41D9-809B-6B42DF529852}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{B5206296-9F17-41D9-809B-6B42DF529852}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{B5206296-9F17-41D9-809B-6B42DF529852}.Release|Any CPU.Build.0 = Release|Any CPU
13+
{9805E74C-D028-4D05-9256-5C2FDC9B6EA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{9805E74C-D028-4D05-9256-5C2FDC9B6EA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{9805E74C-D028-4D05-9256-5C2FDC9B6EA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{9805E74C-D028-4D05-9256-5C2FDC9B6EA8}.Release|Any CPU.Build.0 = Release|Any CPU
1817
EndGlobalSection
1918
GlobalSection(SolutionProperties) = preSolution
2019
HideSolutionNode = FALSE

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# FSharp.Collections.Immutable
2+
3+
F# bindings for System.Collections.Immutable
4+
5+
![.NET Core](https://github.com/fsprojects/FSharp.Collections.Immutable/workflows/.NET%20Core/badge.svg)

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable/Properties/AssemblyInfo.fs

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Source/FSharp.Collections.Immutable/NuGet.Config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable/FSharp.Collections.Immutable.fsproj renamed to ‎src/FSharp.Collections.Immutable/FSharp.Collections.Immutable.fsproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
45
<Description>F# bindings for System.Collections.Immutable</Description>
56
<Copyright>Copyright © XperiAndri 2016</Copyright>
67
<AssemblyTitle>FSharp.Collections.Immutable</AssemblyTitle>
7-
<VersionPrefix>0.1.0</VersionPrefix>
8+
<Company>XperiAndri</Company>
9+
<ProductName>FSharp.Collections.Immutable</ProductName>
10+
<Copyright>Copyright © XperiAndri 2016</Copyright>
11+
<Version>1.0.0</Version>
812
<Authors>XperiAndri;EventHelix</Authors>
13+
<Authors>XperiAndri;EventHelix;vilinski</Authors>
914
<TargetFramework>netstandard2.0</TargetFramework>
1015
<GenerateDocumentationFile>true</GenerateDocumentationFile>
11-
<AssemblyName>FSharp.Collections.Immutable</AssemblyName>
1216
<PackageId>FSharp.Collections.Immutable</PackageId>
1317
<PackageTags>System;Immutable;Collections;FSharp;F#</PackageTags>
1418
<RepositoryType>git</RepositoryType>
15-
<RepositoryUrl>https://github.com/xperiandri/FSharp.Collections.Immutable/</RepositoryUrl>
19+
<RepositoryUrl>https://github.com/fsprojects/FSharp.Collections.Immutable/</RepositoryUrl>
1620
</PropertyGroup>
1721

1822
<ItemGroup>
19-
<Compile Include="Properties\assemblyInfo.fs" />
2023
<Compile Include="immutable-collection-util.fs" />
2124
<Compile Include="flat-list.fs" />
2225
<Compile Include="stack.fs" />

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable/indexed-seq.fs renamed to ‎src/FSharp.Collections.Immutable/indexed-seq.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ module IndexedSeq =
77
let item index seq = check seq; seq.[index]
88
let length seq = check seq; seq.Count
99

10-
module ReadOnlyList = IndexedSeq
10+
module ReadOnlyList = IndexedSeq

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable/maps.fs renamed to ‎src/FSharp.Collections.Immutable/maps.fs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module HashMap =
5252

5353
let inline toBuilder map : HashMapBuilder<_,_> = check map; map.ToBuilder()
5454

55-
55+
5656
// consider alternate implementation using range functions
5757
let inline filter predicate map =
5858
let builder = toBuilder map
@@ -71,11 +71,3 @@ type internal SortedMapFactory =
7171
System.Collections.Immutable.ImmutableSortedDictionary
7272
module SortedMap =
7373
let inline empty<'Key, 'Value> = SortedMapFactory.Create<'Key, 'Value>()
74-
75-
76-
77-
78-
79-
80-
81-

‎Source/FSharp.Collections.Immutable/FSharp.Collections.Immutable/sets.fs renamed to ‎src/FSharp.Collections.Immutable/sets.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ type ISet<'T> = System.Collections.Immutable.IImmutableSet<'T>
55
type SortedSet<'T> = System.Collections.Immutable.ImmutableSortedSet<'T>
66

77
type HashSet<'T> = System.Collections.Immutable.ImmutableHashSet<'T>
8-

0 commit comments

Comments
 (0)
Please sign in to comment.