Skip to content

Commit

Permalink
go/utils/publishrelease: Bump MUSL toolchains used for cutting releases.
Browse files Browse the repository at this point in the history
The new toolchain uses MUSL + mimalloc.

Include the mimalloc license in our released LICENSES notice.
  • Loading branch information
reltuk committed May 16, 2024
1 parent f3f72dc commit 4f9bdd9
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 2 deletions.
29 changes: 29 additions & 0 deletions go/Godeps/LICENSES

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions go/utils/3pdeps/MIMALLOC_LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018-2021 Microsoft Corporation, Daan Leijen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
10 changes: 9 additions & 1 deletion go/utils/3pdeps/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func main() {
PrintDoltLicense(out)
PrintGoLicense(out, root)
PrintMuslLicense(out)
PrintMimallocLicense(out)

sort.Strings(mods)
var l string
Expand Down Expand Up @@ -131,12 +132,19 @@ func PrintDoltLicense(out io.Writer) {
}

func PrintMuslLicense(out io.Writer) {
fmt.Fprintf(out, "================================================================================\n")
fmt.Fprintf(out, "\n================================================================================\n")
fmt.Fprintf(out, "= Some copies of Dolt include portions of musl, statically linked, licensed under: =\n\n")
PrintLicense(out, "utils/3pdeps/MUSL_COPYRIGHT")
fmt.Fprintf(out, "================================================================================\n")
}

func PrintMimallocLicense(out io.Writer) {
fmt.Fprintf(out, "\n================================================================================\n")
fmt.Fprintf(out, "= Some copies of Dolt include portions of mimalloc, statically linked, licensed under: =\n\n")
PrintLicense(out, "utils/3pdeps/MIMALLOC_LICENSE")
fmt.Fprintf(out, "================================================================================\n")
}

func PrintGoLicense(out io.Writer, root string) {
filepath := FindLicenseFile(root, []string{"LICENSE", "../LICENSE"})
fmt.Fprintf(out, "\n================================================================================\n")
Expand Down
2 changes: 1 addition & 1 deletion go/utils/publishrelease/buildpgobinaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -o pipefail
apt-get update && apt-get install -y p7zip-full pigz curl xz-utils mingw-w64 clang-15
cd /
curl -o optcross.tar.xz https://dolthub-tools.s3.us-west-2.amazonaws.com/optcross/"$(uname -m)"-linux_20240425_0.0.1.tar.xz
curl -o optcross.tar.xz https://dolthub-tools.s3.us-west-2.amazonaws.com/optcross/"$(uname -m)"-linux_20240515_0.0.2.tar.xz
tar Jxf optcross.tar.xz
export PATH=/opt/cross/bin:"$PATH"
Expand Down

0 comments on commit 4f9bdd9

Please sign in to comment.