From 1d99708afe536dea4f46eb71d1bf94937075377c Mon Sep 17 00:00:00 2001 From: Maxime Mangel Date: Fri, 29 Sep 2023 11:05:37 +0200 Subject: [PATCH] Release 4.2.0 --- .devcontainer/devcontainer.json | 2 +- build/GithubRelease.fs | 31 +++++++++---------------- build/Publish.fs | 3 +-- build/Utils/Nuget.fs | 14 ++--------- src/Fable.AST/CHANGELOG.md | 6 +++++ src/Fable.AST/Fable.AST.fsproj | 2 +- src/Fable.Cli/CHANGELOG.md | 2 ++ src/Fable.Cli/Fable.Cli.fsproj | 2 +- src/Fable.Core/CHANGELOG.md | 2 ++ src/Fable.Core/Fable.Core.fsproj | 2 +- src/Fable.Transforms/Global/Compiler.fs | 2 +- 11 files changed, 29 insertions(+), 39 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6be9018a12..be1e740ebe 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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}" }, diff --git a/build/GithubRelease.fs b/build/GithubRelease.fs index 8c65473813..0b0a54119a 100644 --- a/build/GithubRelease.fs +++ b/build/GithubRelease.fs @@ -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 diff --git a/build/Publish.fs b/build/Publish.fs index 7ac6b1a76e..425368ee21 100644 --- a/build/Publish.fs +++ b/build/Publish.fs @@ -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..." diff --git a/build/Utils/Nuget.fs b/build/Utils/Nuget.fs index 153c799285..c630fe91a6 100644 --- a/build/Utils/Nuget.fs +++ b/build/Utils/Nuget.fs @@ -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( diff --git a/src/Fable.AST/CHANGELOG.md b/src/Fable.AST/CHANGELOG.md index b42d46774d..38fdaa5081 100644 --- a/src/Fable.AST/CHANGELOG.md +++ b/src/Fable.AST/CHANGELOG.md @@ -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 diff --git a/src/Fable.AST/Fable.AST.fsproj b/src/Fable.AST/Fable.AST.fsproj index 227814fea9..9858aedc57 100644 --- a/src/Fable.AST/Fable.AST.fsproj +++ b/src/Fable.AST/Fable.AST.fsproj @@ -5,7 +5,7 @@ Fable AST netstandard2.0 true - 4.2.1 + 4.3.0 diff --git a/src/Fable.Cli/CHANGELOG.md b/src/Fable.Cli/CHANGELOG.md index a0d8a215d0..02d29f6fe4 100644 --- a/src/Fable.Cli/CHANGELOG.md +++ b/src/Fable.Cli/CHANGELOG.md @@ -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 `[]` without arguments provided should take an empty object * Fix #3494: Calling an attached parametrized getter fails in transpiled javascript * Remove fable-py support diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj index 9f6f17f59a..9201838eff 100644 --- a/src/Fable.Cli/Fable.Cli.fsproj +++ b/src/Fable.Cli/Fable.Cli.fsproj @@ -4,7 +4,7 @@ true Exe net6.0 - 4.1.4 + 4.2.0 * Fix #3438: Source maps * Fix #3440: Don't curry arity-1 functions * Fix #3452: DateTimeOffset conversion to DateTime diff --git a/src/Fable.Core/CHANGELOG.md b/src/Fable.Core/CHANGELOG.md index b591c1d7a2..7b7568f8d4 100644 --- a/src/Fable.Core/CHANGELOG.md +++ b/src/Fable.Core/CHANGELOG.md @@ -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` diff --git a/src/Fable.Core/Fable.Core.fsproj b/src/Fable.Core/Fable.Core.fsproj index 6f0fe8fd82..1154337608 100644 --- a/src/Fable.Core/Fable.Core.fsproj +++ b/src/Fable.Core/Fable.Core.fsproj @@ -5,7 +5,7 @@ Fable Core Library netstandard2.0 true - 4.0.0 + 4.1.0 true diff --git a/src/Fable.Transforms/Global/Compiler.fs b/src/Fable.Transforms/Global/Compiler.fs index 6eec281a04..0ecd03e3b0 100644 --- a/src/Fable.Transforms/Global/Compiler.fs +++ b/src/Fable.Transforms/Global/Compiler.fs @@ -1,7 +1,7 @@ namespace Fable module Literals = - let [] VERSION = "4.1.4" + let [] VERSION = "4.2.0" let [] JS_LIBRARY_VERSION = "1.1.1" type CompilerOptionsHelper =