From b4b4b6aa9e86d59318d24dff6fd6974c224ca839 Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Tue, 8 Aug 2023 15:54:41 +0000 Subject: [PATCH 1/2] Update dep * buildkit to v0.12.1 * go to 1.20 * `build.go` the signature for `progressui.DisplaySolveStatus` changed * `combiner.go` Architecture and OS were removed from the image spec --- .github/workflows/build.yaml | 12 +- .github/workflows/release.yaml | 2 +- .gitpod.Dockerfile | 4 +- Dockerfile | 2 +- go.mod | 43 ++-- go.sum | 384 ++++++++++++++++++++++++++++----- pkg/dazzle/build.go | 4 +- pkg/dazzle/combiner.go | 6 +- 8 files changed, 363 insertions(+), 94 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b1b991f..23bcfa0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v3 with: - go-version: '1.19' + go-version: '1.20' - name: Download all Go modules run: | go mod download @@ -33,7 +33,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v3 with: - go-version: '1.19' + go-version: '1.20' - name: Restore go build cache uses: actions/cache@v1 with: @@ -52,7 +52,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v3 with: - go-version: '1.19' + go-version: '1.20' - name: Run golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -76,7 +76,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v3 with: - go-version: '1.19' + go-version: '1.20' - name: Restore go build cache uses: actions/cache@v1 with: @@ -89,7 +89,7 @@ jobs: run: pushd pkg/test/runner; ./build.sh; popd - name: Install the latest buildkit release run: | - curl -sSL "https://github.com/moby/buildkit/releases/download/v0.11.2/buildkit-v0.11.2.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local + curl -sSL "https://github.com/moby/buildkit/releases/download/v0.12.1/buildkit-v0.12.1.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local - name: Start buildkit daemon run: | sudo --non-interactive --shell < Date: Tue, 12 Dec 2023 22:45:30 +0000 Subject: [PATCH 2/2] Update buildkit --- .github/workflows/build.yaml | 2 +- .gitpod.Dockerfile | 2 +- Dockerfile | 2 +- go.mod | 13 ++++++------ go.sum | 39 ++++++++++++++++++++++-------------- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 23bcfa0..1b9186e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,7 +89,7 @@ jobs: run: pushd pkg/test/runner; ./build.sh; popd - name: Install the latest buildkit release run: | - curl -sSL "https://github.com/moby/buildkit/releases/download/v0.12.1/buildkit-v0.12.1.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local + curl -sSL "https://github.com/moby/buildkit/releases/download/v0.12.4/buildkit-v0.12.4.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local - name: Start buildkit daemon run: | sudo --non-interactive --shell <