From 72b2e440abceb8974e73b89a9f5e4d4c4e0b6cfe Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Tue, 15 Dec 2020 12:57:44 +0100 Subject: [PATCH] Update README.md and table generator for linux-musl-arm --- README.md | 14 ++++++++++++-- .../TableGenerator.Tests/DomainTests.fs | 2 ++ .../TableGenerator/Reference.fs | 4 ++-- .../TableGenerator/Shared.fs | 2 ++ .../TableGenerator/Table.fs | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d47833b6e..84540aa04 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ Please do not directly edit the table below. Use https://github.com/dotnet/insta | **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]
[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-5.0.1XX-rtm]][linux-arm-version-5.0.1XX-rtm]
[tar.gz][linux-arm-targz-5.0.1XX-rtm] - [Checksum][linux-arm-targz-checksum-5.0.1XX-rtm] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]
[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] | [![][linux-arm-badge-3.1.1XX]][linux-arm-version-3.1.1XX]
[tar.gz][linux-arm-targz-3.1.1XX] - [Checksum][linux-arm-targz-checksum-3.1.1XX] | | **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]
[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-5.0.1XX-rtm]][linux-arm64-version-5.0.1XX-rtm]
[tar.gz][linux-arm64-targz-5.0.1XX-rtm] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-rtm] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]
[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] | [![][linux-arm64-badge-3.1.1XX]][linux-arm64-version-3.1.1XX]
[tar.gz][linux-arm64-targz-3.1.1XX] - [Checksum][linux-arm64-targz-checksum-3.1.1XX] | | **Linux-musl-x64** | [![][linux-musl-x64-badge-master]][linux-musl-x64-version-master]
[tar.gz][linux-musl-x64-targz-master] - [Checksum][linux-musl-x64-targz-checksum-master] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]
[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-5.0.1XX-rtm]][linux-musl-x64-version-5.0.1XX-rtm]
[tar.gz][linux-musl-x64-targz-5.0.1XX-rtm] - [Checksum][linux-musl-x64-targz-checksum-5.0.1XX-rtm] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]
[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] | [![][linux-musl-x64-badge-3.1.1XX]][linux-musl-x64-version-3.1.1XX]
[tar.gz][linux-musl-x64-targz-3.1.1XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.1XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | **N/A** | **N/A** | **N/A** | **N/A** | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-master]][linux-musl-arm-version-master]
[tar.gz][linux-musl-arm-targz-master] - [Checksum][linux-musl-arm-targz-checksum-master] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]
[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** | **N/A** | **N/A** | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-master]][linux-musl-arm64-version-master]
[tar.gz][linux-musl-arm64-targz-master] - [Checksum][linux-musl-arm64-targz-checksum-master] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]
[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** | **N/A** | **N/A** | | **RHEL 6** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]
[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] | [![][rhel-6-badge-3.1.1XX]][rhel-6-version-3.1.1XX]
[tar.gz][rhel-6-targz-3.1.1XX] - [Checksum][rhel-6-targz-checksum-3.1.1XX] | Reference notes: @@ -354,11 +354,21 @@ Reference notes: [linux-musl-arm-targz-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/linux_musl_arm_Release_version_badge.svg +[linux-musl-arm-version-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm.tar.gz.sha + [linux-musl-arm64-badge-master]: https://aka.ms/dotnet/net6/dev/Sdk/linux_musl_arm64_Release_version_badge.svg [linux-musl-arm64-version-master]: https://aka.ms/dotnet/net6/dev/Sdk/productCommit-linux-musl-arm64.txt [linux-musl-arm64-targz-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/linux_musl_arm64_Release_version_badge.svg +[linux-musl-arm64-version-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-5.0.2XX]: https://aka.ms/dotnet/net5/5.0.2xx/daily/Sdk/dotnet-sdk-linux-musl-arm64.tar.gz.sha + [win-arm-badge-master]: https://aka.ms/dotnet/net6/dev/Sdk/win_arm_Release_version_badge.svg [win-arm-version-master]: https://aka.ms/dotnet/net6/dev/Sdk/productCommit-win-arm.txt [win-arm-zip-master]: https://aka.ms/dotnet/net6/dev/Sdk/dotnet-sdk-win-arm.zip diff --git a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs index 9ed7515d0..317470222 100644 --- a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs +++ b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs @@ -36,6 +36,7 @@ let ``it can get major and minor version of a branch``() = (MajorMinor ({ Major = 3 Minor = 1 + Patch = 199 Release = ""})) [] @@ -49,6 +50,7 @@ let ``it can get major and minor version of a preview branch``() = (MajorMinor ({ Major = 5 Minor = 0 + Patch = 199 Release = "preview2"})) [] diff --git a/tools/sdk-readme-table-generator/TableGenerator/Reference.fs b/tools/sdk-readme-table-generator/TableGenerator/Reference.fs index 9092a70e7..3f45cf8cf 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Reference.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Reference.fs @@ -155,14 +155,14 @@ let linuxMuslArmReferenceTemplate branch = let format branch = formatTemplate "linux-musl-arm" linuxMuslReferenceTemplate branch match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> None let linuxMuslArm64ReferenceTemplate branch = let format branch = formatTemplate "linux-musl-arm64" linuxMuslReferenceTemplate branch match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> None let winArmMuslReferenceTemplate branch = diff --git a/tools/sdk-readme-table-generator/TableGenerator/Shared.fs b/tools/sdk-readme-table-generator/TableGenerator/Shared.fs index 6cbaabc67..63aec60ff 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Shared.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Shared.fs @@ -18,6 +18,7 @@ let branchNameShorten (branch: Branch): string = type BranchMajorMinorVersion = { Major: int Minor: int + Patch: int Release: string} type BranchMajorMinorVersionOrMaster = @@ -38,5 +39,6 @@ let getMajorMinor (branch: Branch): BranchMajorMinorVersionOrMaster = MajorMinor { Major = version.Major Minor = version.Minor + Patch = version.Patch Release = version.Release} | _ -> NoVersion diff --git a/tools/sdk-readme-table-generator/TableGenerator/Table.fs b/tools/sdk-readme-table-generator/TableGenerator/Table.fs index fa47f9a2e..3be2d34ab 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Table.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Table.fs @@ -79,7 +79,7 @@ let linuxMuslRowArm branches = let tableTemplateForThisArch branch = match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> notAvailable formRow "**Linux-musl-arm**" tableTemplateForThisArch branches @@ -88,7 +88,7 @@ let linuxMuslRowArm64 branches = let tableTemplateForThisArch branch = match getMajorMinor branch with | Master -> format branch - | MajorMinor { Major = major; Minor = _minor } when major >= 6 -> format branch + | MajorMinor { Major = major; Minor = _minor; Patch = patch } when major >= 6 || (major >= 5 && patch >= 299) -> format branch | _ -> notAvailable formRow "**Linux-musl-arm64**" tableTemplateForThisArch branches