Skip to content

Commit

Permalink
Release 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxime Mangel committed Sep 29, 2023
1 parent 37f0cdb commit 1d99708
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"containerEnv": {
// Expose the local environment variable to the container
// They are used for releasing and publishing from the container
"GITHUB_TOKEN": "${localEnv:GITHUB_TOKEN}",
"GITHUB_TOKEN_FABLE_ORG": "${localEnv:GITHUB_TOKEN_FABLE_ORG}",
"FABLE_NUGET_KEY": "${localEnv:FABLE_NUGET_KEY}"
},

Expand Down
31 changes: 11 additions & 20 deletions build/GithubRelease.fs
Original file line number Diff line number Diff line change
Expand Up @@ -41,39 +41,30 @@ let private createTag (version: ChangelogParser.Types.Version) =
|> CmdLine.toString
)

Command.Run(
"git",
CmdLine.empty
|> CmdLine.appendRaw "tag"
|> CmdLine.appendPrefix "-a" (versionText)
|> CmdLine.appendPrefix "-m" $"Release {versionText}"
|> CmdLine.toString
)
// Command.Run(
// "git",
// CmdLine.empty
// |> CmdLine.appendRaw "tag"
// |> CmdLine.appendPrefix "-a" (versionText)
// |> CmdLine.appendPrefix "-m" $"Release {versionText}"
// |> CmdLine.toString
// )

Command.Run(
"git",
"push"
)

Command.Run(
"git",
CmdLine.empty
|> CmdLine.appendRaw "push"
|> CmdLine.appendRaw "origin"
|> CmdLine.appendRaw versionText
|> CmdLine.toString
)


let handle (args: string list) =
Publish.handle args

let githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN")
let githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN_FABLE_ORG")

if githubToken = null then
failwith "Missing GITHUB_TOKEN environment variable"
failwith "Missing GITHUB_TOKEN_FABLE_ORG environment variable"

let versionInfo = Changelog.getLastVersion Changelog.fableCLi

createGithubRelease githubToken versionInfo
createTag versionInfo
createGithubRelease githubToken versionInfo
3 changes: 1 addition & 2 deletions build/Publish.fs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ let private publishNuget (fsprojDir : string) =
let updatedFsprojContent = Fsproj.replaceVersion fsprojContent lastChangelogVersion
File.WriteAllText(fsprojPath, updatedFsprojContent)
let nupkgPath = Dotnet.pack fsprojDir
let nupkgFolder = Path.GetDirectoryName nupkgPath
Dotnet.Nuget.push(nupkgFolder, nugetKey)
Dotnet.Nuget.push(nupkgPath, nugetKey)
printfn $"Published!"
else
printfn $"Already up-to-date, skipping..."
Expand Down
14 changes: 2 additions & 12 deletions build/Utils/Nuget.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,12 @@ module Dotnet =

type Nuget =

static member push(projectDir: string, nugetKey : string) =
static member push(nupkgPath: string, nugetKey : string) =
Command.Run(
"dotnet",
"nuget push *.nupkg -s https://api.nuget.org/v3/index.json",
workingDirectory = projectDir
$"nuget push {nupkgPath} -s https://api.nuget.org/v3/index.json -k {nugetKey}"
)

static member push
(
projectDir: string,
nugetKey : string,
preBuildAction: unit -> unit
) =
preBuildAction ()
Nuget.push(projectDir, nugetKey)

let pack (projectDir: string) =
let struct (standardOutput, _) =
Command.ReadAsync(
Expand Down
6 changes: 6 additions & 0 deletions src/Fable.AST/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 4.3.0

### Added

* Add `Attributes` to `MemberRefInfo`

## 4.2.1

* Get sources from PluginHelper
Expand Down
2 changes: 1 addition & 1 deletion src/Fable.AST/Fable.AST.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>Fable AST</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.2.1</Version>
<Version>4.3.0</Version>
</PropertyGroup>
<ItemGroup>
<Compile Include="Common.fs" />
Expand Down
2 changes: 2 additions & 0 deletions src/Fable.Cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 4.2.0

* Fix #3480: Function decorated with `[<NamedParams>]` without arguments provided should take an empty object
* Fix #3494: Calling an attached parametrized getter fails in transpiled javascript
* Remove fable-py support
Expand Down
2 changes: 1 addition & 1 deletion src/Fable.Cli/Fable.Cli.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Version>4.1.4</Version>
<Version>4.2.0</Version>
<PackageReleaseNotes>* Fix #3438: Source maps
* Fix #3440: Don't curry arity-1 functions
* Fix #3452: DateTimeOffset conversion to DateTime
Expand Down
2 changes: 2 additions & 0 deletions src/Fable.Core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 4.1.0

* Fix #3482: Remove `Py.python` and `Py.expr_python`
* Add `!^` to `Fable.Core.RustInterop` module
* Fix #3484: Rename `emitStatement` to `emitPyStatement` in `PyInterop`
Expand Down
2 changes: 1 addition & 1 deletion src/Fable.Core/Fable.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>Fable Core Library</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.0.0</Version>
<Version>4.1.0</Version>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Fable.Transforms/Global/Compiler.fs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace Fable

module Literals =
let [<Literal>] VERSION = "4.1.4"
let [<Literal>] VERSION = "4.2.0"
let [<Literal>] JS_LIBRARY_VERSION = "1.1.1"

type CompilerOptionsHelper =
Expand Down

0 comments on commit 1d99708

Please sign in to comment.