Commit bf14ef65 authored by Amos Wenger's avatar Amos Wenger

libc7zip 1.6.0, download from broth

parent 343f9d68
Pipeline #10359 passed with stage
in 2 minutes and 15 seconds
......@@ -58,7 +58,7 @@ func EnsureDeps(consumer *state.Consumer) error {
}
execDir := filepath.Dir(execPath)
lockFilePath := filepath.Join(execDir, ".butler-deps.lock")
lockFilePath := filepath.Join(execDir, ".boar-deps.lock")
lf, err := lockfile.New(lockFilePath)
if err != nil {
return errors.WithStack(err)
......@@ -95,7 +95,6 @@ func EnsureDeps(consumer *state.Consumer) error {
f, err := os.Open(entryPath)
if err != nil {
consumer.Debugf("")
consumer.Debugf("[%s] could not open, will fetch", entry.Name)
if !os.IsNotExist(err) {
consumer.Debugf(" %s", err.Error())
......@@ -141,7 +140,6 @@ func EnsureDeps(consumer *state.Consumer) error {
// []byte{} literals are not the friendliest. don't @ me.
actual := fmt.Sprintf("%x", h.Sum(nil))
if actual != expected {
consumer.Debugf("")
consumer.Debugf("[%s] %s hash mismatch, will fetch", entry.Name, dh.Algo)
consumer.Debugf(" wanted %s", expected)
consumer.Debugf(" got %s", actual)
......@@ -165,6 +163,8 @@ func EnsureDeps(consumer *state.Consumer) error {
firstSource = false
err = func() error {
beforeHeal := time.Now()
f, err := eos.Open(source, option.WithConsumer(consumer))
if err != nil {
return errors.WithStack(err)
......@@ -222,7 +222,7 @@ func EnsureDeps(consumer *state.Consumer) error {
if foundFiles < len(toFetch) {
return errors.Errorf("Found only %d files of the required %d", foundFiles, len(toFetch))
}
consumer.Statf("Installed %s's worth of dependencies", humanize.IBytes(uint64(installedSize)))
consumer.Statf("Installed %s's worth of dependencies in %s", humanize.IBytes(uint64(installedSize)), time.Since(beforeHeal))
return nil
}()
......
// Code generated by go generate; DO NOT EDIT.
// Generated at 2018-02-13 17:51:30.579035757 +0100 CET m=+17.606651348
// For version v1.5.0, base URL https://dl.itch.ovh/libc7zip
// Generated at 2018-04-18 18:15:40.5274705 +0200 CEST m=+9.441967801
// For version 1.6.0, base URL https://broth.itch.ovh/libc7zip
package formulas
import "github.com/itchio/boar/szextractor/types"
var ByOsArch = types.DepSpecMap{"linux-386": types.DepSpec{Entries: []types.DepEntry{types.DepEntry{Name: "7z.so", Size: 2291392, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "5a3313d9d69ce3fe648022a7aa588b0c5195de65"}, types.DepHash{Algo: "sha256", Value: "1cc4e611b4cc91de144fe12e9fbc5242f775d37574c6eda261e3d6fd888c9c2b"}}}, types.DepEntry{Name: "libc7zip.so", Size: 173832, Hashes: []types.DepHash{types.DepHash{Algo: "sha256", Value: "67e0f16f9068a8c3a6a5b359d22b3cf820e9c42c103b73a986e12ae54c49f5a3"}, types.DepHash{Algo: "sha1", Value: "b8582cec8504b0d4a10bc90a6d4ca19416406881"}}}}, Sources: []string{"https://dl.itch.ovh/libc7zip/linux-386/v1.5.0/libc7zip.zip"}}, "darwin-amd64": types.DepSpec{Entries: []types.DepEntry{types.DepEntry{Name: "7z.so", Size: 2276972, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "c8ab6bea9e01218f3a47d8786ef25e5e76e5eedb"}, types.DepHash{Algo: "sha256", Value: "a2fb72a26b28257b6c738b0ef27b8f2044ed4fb23a4125386f659e19b8e3828b"}}}, types.DepEntry{Name: "libc7zip.dylib", Size: 160008, Hashes: []types.DepHash{types.DepHash{Algo: "sha256", Value: "441cf2026e6223d52d71af631cb7fbb76ed6c386d36670fbff5c48014e9d76ea"}, types.DepHash{Algo: "sha1", Value: "e3550c11b590328079d61cdebdc9efab22dfef58"}}}}, Sources: []string{"https://dl.itch.ovh/libc7zip/darwin-amd64/v1.5.0/libc7zip.zip"}}, "windows-386": types.DepSpec{Entries: []types.DepEntry{types.DepEntry{Name: "7z.dll", Size: 1079408, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "16bf27695d927e6142c7d05dc78980cb327f36b8"}, types.DepHash{Algo: "sha256", Value: "71e68d9913afcd008a9c76d6efdce6aaf1b8a3d16d2652df484b4bbe1da76fbb"}}}, types.DepEntry{Name: "c7zip.dll", Size: 397928, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "15443cd2724e7d3af843bb9cf2d5624d570fe847"}, types.DepHash{Algo: "sha256", Value: "85ae5b6c8f8635044f3e5168b52359938b3a8c179c80bc3640f34f3f4ef75c7b"}}}}, Sources: []string{"https://dl.itch.ovh/libc7zip/windows-386/v1.5.0/libc7zip.zip"}}, "windows-amd64": types.DepSpec{Entries: []types.DepEntry{types.DepEntry{Name: "7z.dll", Size: 1614952, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "1ee14b9f4aac98925911a2aaf8aae7de1f787592"}, types.DepHash{Algo: "sha256", Value: "5dd34626363aa9d30e7533f3df0fbb00209c63718ee388d8234822621cbd95e1"}}}, types.DepEntry{Name: "c7zip.dll", Size: 539760, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "05fb56690f8092a486a9e5a1ec0b152e8ed6676f"}, types.DepHash{Algo: "sha256", Value: "c0c3cce72cff3f6b68c8f52337083d2bb4f0ad5de7554ba2763f201346632536"}}}}, Sources: []string{"https://dl.itch.ovh/libc7zip/windows-amd64/v1.5.0/libc7zip.zip"}}, "linux-amd64": types.DepSpec{Entries: []types.DepEntry{types.DepEntry{Name: "7z.so", Size: 2273248, Hashes: []types.DepHash{types.DepHash{Algo: "sha1", Value: "ff47097a16402a6144e868daff4416e6ab8c2584"}, types.DepHash{Algo: "sha256", Value: "23f949fdbcb3cb0722539d728824138c8b5048577d9de350ceb17da0071b3a99"}}}, types.DepEntry{Name: "libc7zip.so", Size: 193152, Hashes: []types.DepHash{types.DepHash{Algo: "sha256", Value: "fc5e3d95adb21efe666b6b5cc0ff46594302e5efe7704b386a117790a6979b6e"}, types.DepHash{Algo: "sha1", Value: "f93a8dda18a527273e7f828fc7ef69fea18cb67d"}}}}, Sources: []string{"https://dl.itch.ovh/libc7zip/linux-amd64/v1.5.0/libc7zip.zip"}}}
var ByOsArch = types.DepSpecMap{"linux-amd64":types.DepSpec{Entries:[]types.DepEntry{types.DepEntry{Name:"7z.so", Size:2273248, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"ff47097a16402a6144e868daff4416e6ab8c2584"}, types.DepHash{Algo:"sha256", Value:"23f949fdbcb3cb0722539d728824138c8b5048577d9de350ceb17da0071b3a99"}}}, types.DepEntry{Name:"libc7zip.so", Size:193152, Hashes:[]types.DepHash{types.DepHash{Algo:"sha256", Value:"fc5e3d95adb21efe666b6b5cc0ff46594302e5efe7704b386a117790a6979b6e"}, types.DepHash{Algo:"sha1", Value:"f93a8dda18a527273e7f828fc7ef69fea18cb67d"}}}}, Sources:[]string{"https://broth.itch.ovh/libc7zip/linux-amd64/1.6.0/.zip"}}, "windows-386":types.DepSpec{Entries:[]types.DepEntry{types.DepEntry{Name:"7z.dll", Size:1080424, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"4d08cdb4b8a24521c11a65408e08532003859f08"}, types.DepHash{Algo:"sha256", Value:"3dd5259b835045454a489b01fd3dd7b350553189fe1caf60cada2d43647eae78"}}}, types.DepEntry{Name:"c7zip.dll", Size:398952, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"97e5ce08922268fa055fb47a92fbc9b63cd7a5b5"}, types.DepHash{Algo:"sha256", Value:"a6359d4d3b2633777555332d99e38ab7c1722eca2f7677bec8bb3c9a7ec7c364"}}}}, Sources:[]string{"https://broth.itch.ovh/libc7zip/windows-386/1.6.0/.zip"}}, "linux-386":types.DepSpec{Entries:[]types.DepEntry{types.DepEntry{Name:"7z.so", Size:2291392, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"5a3313d9d69ce3fe648022a7aa588b0c5195de65"}, types.DepHash{Algo:"sha256", Value:"1cc4e611b4cc91de144fe12e9fbc5242f775d37574c6eda261e3d6fd888c9c2b"}}}, types.DepEntry{Name:"libc7zip.so", Size:173832, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"b8582cec8504b0d4a10bc90a6d4ca19416406881"}, types.DepHash{Algo:"sha256", Value:"67e0f16f9068a8c3a6a5b359d22b3cf820e9c42c103b73a986e12ae54c49f5a3"}}}}, Sources:[]string{"https://broth.itch.ovh/libc7zip/linux-386/1.6.0/.zip"}}, "windows-amd64":types.DepSpec{Entries:[]types.DepEntry{types.DepEntry{Name:"7z.dll", Size:1615976, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"03ab173d2656f6fb56f8211c5bf1754ba4587d4c"}, types.DepHash{Algo:"sha256", Value:"e87310d1ebaf7f176fa7219339e9871db9c53453934dab80ff604c3b417bc8c4"}}}, types.DepEntry{Name:"c7zip.dll", Size:540776, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"43568504eb1853a8776eb1f99458fa1b0e3a7b93"}, types.DepHash{Algo:"sha256", Value:"f139d94757cbca05744b5d9e61118ff4913ad737c0c4132666a4c97e6aa3041d"}}}}, Sources:[]string{"https://broth.itch.ovh/libc7zip/windows-amd64/1.6.0/.zip"}}, "darwin-amd64":types.DepSpec{Entries:[]types.DepEntry{types.DepEntry{Name:"7z.so", Size:2276972, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"95ab0692ecdccd46779d4fc0be86393b86f7c935"}, types.DepHash{Algo:"sha256", Value:"52cabfff2930ff581b94ac79c16df2844755f9c60bd0f1dab3499ce2a9e58de3"}}}, types.DepEntry{Name:"libc7zip.dylib", Size:160008, Hashes:[]types.DepHash{types.DepHash{Algo:"sha1", Value:"1c4ec1bcccf8f259a1b6be32d7bbfba9155f0157"}, types.DepHash{Algo:"sha256", Value:"a2049340cf2cbea6057f5c8357197ca75864459552a48b359995b2c0ca4e8f4a"}}}}, Sources:[]string{"https://broth.itch.ovh/libc7zip/darwin-amd64/1.6.0/.zip"}}}
......@@ -22,7 +22,7 @@ import (
)
func main() {
version := "v1.5.0"
version := "1.6.0"
osarches := []string{
"windows-386",
"windows-amd64",
......@@ -30,7 +30,7 @@ func main() {
"linux-amd64",
"darwin-amd64",
}
baseURL := "https://dl.itch.ovh/libc7zip"
baseURL := "https://broth.itch.ovh/libc7zip"
log.Printf("Generating depsMap for %s", version)
depSpecMap := make(types.DepSpecMap)
......@@ -48,7 +48,7 @@ func main() {
ds := types.DepSpec{}
zipURL := fmt.Sprintf("%s/%s/%s/libc7zip.zip", baseURL, osarch, version)
zipURL := fmt.Sprintf("%s/%s/%s/.zip", baseURL, osarch, version)
f, err := eos.Open(zipURL)
must(err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment