From b9149d8bbcef17f3398b32c2fbe3ac425ea1899f Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 08:58:22 -0500 Subject: [PATCH 01/13] Update build image to 1.23.3 and the build image to v0.1.7. --- .drone/drone.yml | 58 +++++++++---------- .github/workflows/check-linux-build-image.yml | 2 +- Dockerfile | 2 +- Dockerfile.windows | 2 +- go.mod | 2 +- tools/make/build-container.mk | 2 +- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.drone/drone.yml b/.drone/drone.yml index 2f14b17c71..59ebd247a4 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -110,7 +110,7 @@ steps: - commands: - apt-get update -y && apt-get install -y libsystemd-dev - make lint - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Lint trigger: event: @@ -125,7 +125,7 @@ platform: steps: - commands: - make GO_TAGS="nodocker" test - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Run Go tests trigger: event: @@ -140,7 +140,7 @@ platform: steps: - commands: - K8S_USE_DOCKER_NETWORK=1 make test - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Run Go tests volumes: - name: docker @@ -164,7 +164,7 @@ steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork" ./...''' - image: grafana/alloy-build-image:v0.1.6-windows + image: grafana/alloy-build-image:v0.1.7-windows name: Run Go tests trigger: ref: @@ -179,7 +179,7 @@ platform: steps: - commands: - make alloy-image - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build container volumes: - name: docker @@ -205,7 +205,7 @@ platform: steps: - commands: - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"' - image: grafana/alloy-build-image:v0.1.6-windows + image: grafana/alloy-build-image:v0.1.7-windows name: Build container volumes: - name: docker @@ -232,7 +232,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -249,7 +249,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -266,7 +266,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -283,7 +283,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -299,7 +299,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -315,7 +315,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -331,7 +331,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -347,7 +347,7 @@ steps: - commands: - make generate-ui - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Build trigger: event: @@ -364,7 +364,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM= GOEXPERIMENT=boringcrypto make alloy - image: grafana/alloy-build-image:v0.1.6-boringcrypto + image: grafana/alloy-build-image:v0.1.7-boringcrypto name: Build trigger: event: @@ -381,7 +381,7 @@ steps: - make generate-ui - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM= GOEXPERIMENT=boringcrypto make alloy - image: grafana/alloy-build-image:v0.1.6-boringcrypto + image: grafana/alloy-build-image:v0.1.7-boringcrypto name: Build trigger: event: @@ -397,7 +397,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Configure QEMU volumes: - name: docker @@ -417,7 +417,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Publish container volumes: - name: docker @@ -440,7 +440,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Configure QEMU volumes: - name: docker @@ -460,7 +460,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Publish container volumes: - name: docker @@ -494,7 +494,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6-windows + image: grafana/alloy-build-image:v0.1.7-windows name: Build containers volumes: - name: docker @@ -517,7 +517,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Configure QEMU volumes: - name: docker @@ -537,7 +537,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Publish container volumes: - name: docker @@ -560,7 +560,7 @@ steps: - commands: - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes failure: ignore - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Configure QEMU volumes: - name: docker @@ -580,7 +580,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Publish container volumes: - name: docker @@ -614,7 +614,7 @@ steps: from_secret: docker_password GCR_CREDS: from_secret: gcr_admin - image: grafana/alloy-build-image:v0.1.6-windows + image: grafana/alloy-build-image:v0.1.7-windows name: Build containers volumes: - name: docker @@ -715,7 +715,7 @@ steps: from_secret: gpg_private_key GPG_PUBLIC_KEY: from_secret: gpg_public_key - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Publish release volumes: - name: docker @@ -738,7 +738,7 @@ steps: - commands: - DOCKER_OPTS="" make dist/alloy-linux-amd64 - DOCKER_OPTS="" make test-packages - image: grafana/alloy-build-image:v0.1.6 + image: grafana/alloy-build-image:v0.1.7 name: Test Linux system packages volumes: - name: docker @@ -836,6 +836,6 @@ kind: secret name: updater_private_key --- kind: signature -hmac: 4dfd6aff0a0f50f6d95e84563afe02bc941cdc2ac4447aebe2ba97492f6e7db2 +hmac: 10e6be95fbe639c7701a96c7b0523e849b28389d09eda8b122de3c981a93c4c0 ... diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index 9c37ab5303..fedf9e579c 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -25,7 +25,7 @@ jobs: push: false tags: grafana/alloy-build-image:latest build-args: | - GO_RUNTIME=golang:1.22.3-bullseye + GO_RUNTIME=golang:1.23.3-bullseye - name: Create test Linux build image for boring crypto uses: docker/build-push-action@v6 diff --git a/Dockerfile b/Dockerfile index 0eb3f1fac6..5b5820d35b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set # in environment variables. -FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.6 as build +FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.7 as build ARG BUILDPLATFORM ARG TARGETPLATFORM ARG TARGETOS diff --git a/Dockerfile.windows b/Dockerfile.windows index d5066c02d5..097266eaed 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM grafana/alloy-build-image:v0.1.6-windows as builder +FROM grafana/alloy-build-image:v0.1.7-windows as builder ARG VERSION ARG RELEASE_BUILD=1 ARG GO_TAGS diff --git a/go.mod b/go.mod index 5ab95d477b..1104b5f6b8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/alloy -go 1.22.7 +go 1.23.3 require ( cloud.google.com/go/pubsub v1.40.0 diff --git a/tools/make/build-container.mk b/tools/make/build-container.mk index 96d681a7ba..7df90d635c 100644 --- a/tools/make/build-container.mk +++ b/tools/make/build-container.mk @@ -34,7 +34,7 @@ # variable names should be passed through to the container. USE_CONTAINER ?= 0 -BUILD_IMAGE_VERSION ?= v0.1.6 +BUILD_IMAGE_VERSION ?= v0.1.7 BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION) DOCKER_OPTS ?= -it From 559c7c69e066c9ce9760ec87bd3ecc5c23779b20 Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 09:05:15 -0500 Subject: [PATCH 02/13] More hard coded strings --- .github/workflows/fuzz-go.yml | 4 ++-- .github/workflows/integration-tests.yml | 2 +- .github/workflows/test.yml | 4 ++-- CHANGELOG.md | 3 +++ docs/Makefile | 4 ++-- example/images/grizzly/Dockerfile | 2 +- example/images/jb/Dockerfile | 2 +- internal/cmd/integration-tests/configs/kafka/Dockerfile | 2 +- internal/cmd/integration-tests/configs/otel-gen/Dockerfile | 2 +- internal/cmd/integration-tests/configs/prom-gen/Dockerfile | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/fuzz-go.yml b/.github/workflows/fuzz-go.yml index 5b82d92c52..0bf241e719 100644 --- a/.github/workflows/fuzz-go.yml +++ b/.github/workflows/fuzz-go.yml @@ -67,10 +67,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Go 1.22 + - name: Set up Go 1.23 uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" cache: false - name: Find cache location diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 823ce60c21..9610db275a 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" - name: Set OTEL Exporter Endpoint run: echo "OTEL_EXPORTER_ENDPOINT=172.17.0.1:4318" >> $GITHUB_ENV - name: Run tests diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c9b0acc63..a952cc5a05 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,10 +17,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Go 1.22 + - name: Set up Go 1.23 uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" cache: true - name: Test run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" make GO_TAGS="nodocker" test diff --git a/CHANGELOG.md b/CHANGELOG.md index ea9f8dd8ef..49bc4b446d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,9 @@ Main (unreleased) - Change the stability of the `livedebugging` feature from "experimental" to "generally available". (@wildum) +- Use Go 1.23.3 for builds. (@mattdurham) + + v1.5.0 ----------------- diff --git a/docs/Makefile b/docs/Makefile index d2a5fc4227..0340094763 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ docs: check-cloudwatch-integration endif check-cloudwatch-integration: - $(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.22.7-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md + $(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md generate-cloudwatch-integration: - $(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.22.7-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate + $(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate diff --git a/example/images/grizzly/Dockerfile b/example/images/grizzly/Dockerfile index 25be31db0b..6c7c4cec5c 100644 --- a/example/images/grizzly/Dockerfile +++ b/example/images/grizzly/Dockerfile @@ -1,3 +1,3 @@ -FROM golang:1.22-alpine +FROM golang:1.23-alpine RUN go install github.com/grafana/grizzly/cmd/grr@v0.4.3 diff --git a/example/images/jb/Dockerfile b/example/images/jb/Dockerfile index 786324a42e..751eb153c2 100644 --- a/example/images/jb/Dockerfile +++ b/example/images/jb/Dockerfile @@ -1,3 +1,3 @@ -FROM golang:1.22-alpine +FROM golang:1.23-alpine RUN go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1 diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile index 9aa1f58e56..8694ba19a9 100644 --- a/internal/cmd/integration-tests/configs/kafka/Dockerfile +++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 as build +FROM golang:1.23.7 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ diff --git a/internal/cmd/integration-tests/configs/otel-gen/Dockerfile b/internal/cmd/integration-tests/configs/otel-gen/Dockerfile index 7297f48ea7..2880eac293 100644 --- a/internal/cmd/integration-tests/configs/otel-gen/Dockerfile +++ b/internal/cmd/integration-tests/configs/otel-gen/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 as build +FROM golang:1.23.3 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ diff --git a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile index 95d239c417..23a5750b94 100644 --- a/internal/cmd/integration-tests/configs/prom-gen/Dockerfile +++ b/internal/cmd/integration-tests/configs/prom-gen/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 as build +FROM golang:1.23.3 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ From 0323f747b3639fd00fa703c4b72a04be000275c5 Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 10:07:57 -0500 Subject: [PATCH 03/13] Bump up the size of runners. --- .github/workflows/check-linux-build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index fedf9e579c..1a5a95dc7a 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -7,7 +7,7 @@ on: jobs: check-linux-build-image: - runs-on: ubuntu-latest + runs-on: ubuntu-x64-large steps: - name: Checkout uses: actions/checkout@v4 From 4e9f9099442e584365b5d336f32d657535ac71c1 Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 10:20:20 -0500 Subject: [PATCH 04/13] Fix golang version --- internal/cmd/integration-tests/configs/kafka/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile index 8694ba19a9..24d9791cd0 100644 --- a/internal/cmd/integration-tests/configs/kafka/Dockerfile +++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.7 as build +FROM golang:1.23.3 as build WORKDIR /app/ COPY go.mod go.sum ./ COPY syntax/go.mod syntax/go.sum ./syntax/ From f3e7ee476336c227e12cd7b4f1c073b884b8069f Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 10:37:41 -0500 Subject: [PATCH 05/13] bump runner size. --- .github/workflows/check-linux-build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index 1a5a95dc7a..c0132a00d7 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -7,7 +7,7 @@ on: jobs: check-linux-build-image: - runs-on: ubuntu-x64-large + runs-on: github-hosted-ubuntu-x64-large steps: - name: Checkout uses: actions/checkout@v4 From 8804b7c22eefb13a6dac271a6c6b72d314e0537a Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 11:30:21 -0500 Subject: [PATCH 06/13] Find free space --- .github/workflows/check-linux-build-image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index c0132a00d7..da85ac5967 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -12,6 +12,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Remove unnecessary files + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + - name: Setup QEMU uses: docker/setup-qemu-action@v3 From c5cfd2e6d6a5dc93d40b20b7011a7279875d1411 Mon Sep 17 00:00:00 2001 From: matt durham Date: Tue, 19 Nov 2024 12:02:41 -0500 Subject: [PATCH 07/13] Find free space --- .github/workflows/check-linux-build-image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index da85ac5967..dcbcfa5fcb 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -16,6 +16,11 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" + sudo rm -rf /usr/share/dotnet + sudo rm -rf /opt/ghc + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + - name: Setup QEMU uses: docker/setup-qemu-action@v3 From 413e266611a839d49b6ff60388b9b10cecfd09e6 Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 20 Nov 2024 09:57:07 -0500 Subject: [PATCH 08/13] More things for diskspace --- .github/workflows/check-linux-build-image.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index dcbcfa5fcb..be550e0d04 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -7,20 +7,18 @@ on: jobs: check-linux-build-image: - runs-on: github-hosted-ubuntu-x64-large + runs-on: ubuntu-x64 steps: - name: Checkout uses: actions/checkout@v4 - name: Remove unnecessary files run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - sudo rm -rf /usr/share/dotnet - sudo rm -rf /opt/ghc - sudo rm -rf "/usr/local/share/boost" - sudo rm -rf "$AGENT_TOOLSDIRECTORY" - + rm -rf /usr/share/dotnet + rm -rf "$AGENT_TOOLSDIRECTORY" + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf /opt/hostedtoolcache - name: Setup QEMU uses: docker/setup-qemu-action@v3 From 82c8c9e4b28abb82193ff7a61872fcca80a4369d Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 20 Nov 2024 11:14:23 -0500 Subject: [PATCH 09/13] Use bigger image --- .github/workflows/docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 29e3146857..4b9e41410a 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -13,7 +13,7 @@ jobs: # platform, but we're really only looking for issues that are # architecture-independent. linux: - runs-on: ubuntu-latest + runs-on: ubuntu-x64 steps: - uses: actions/checkout@v4 - name: Build image From 5183d07c486fa293f1efc07b4a12b09859473687 Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 20 Nov 2024 15:15:15 -0500 Subject: [PATCH 10/13] Use bigger image --- .github/workflows/check-linux-build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index be550e0d04..71c4803622 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -7,7 +7,7 @@ on: jobs: check-linux-build-image: - runs-on: ubuntu-x64 + runs-on: ubuntu-x64-large steps: - name: Checkout uses: actions/checkout@v4 From 53ef179f23882b64d6014c2338ca1890877782ed Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 20 Nov 2024 15:16:39 -0500 Subject: [PATCH 11/13] use github hosted --- .github/workflows/check-linux-build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml index 71c4803622..2958b70607 100644 --- a/.github/workflows/check-linux-build-image.yml +++ b/.github/workflows/check-linux-build-image.yml @@ -7,7 +7,7 @@ on: jobs: check-linux-build-image: - runs-on: ubuntu-x64-large + runs-on: github-hosted-ubuntu-x64-large steps: - name: Checkout uses: actions/checkout@v4 From a3a3f63ebcde29dfd8d70eb25d6df49a8a7eaa56 Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 20 Nov 2024 15:20:49 -0500 Subject: [PATCH 12/13] use github hosted --- .github/workflows/docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 4b9e41410a..73ae70b980 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -13,7 +13,7 @@ jobs: # platform, but we're really only looking for issues that are # architecture-independent. linux: - runs-on: ubuntu-x64 + runs-on: github-hosted-ubuntu-x64-large steps: - uses: actions/checkout@v4 - name: Build image From 8943abceb69226157066cd4db014b49d28d156a6 Mon Sep 17 00:00:00 2001 From: matt durham Date: Thu, 21 Nov 2024 09:28:04 -0500 Subject: [PATCH 13/13] use github hosted --- .github/workflows/docker-images.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 73ae70b980..0facd5de36 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -13,6 +13,7 @@ jobs: # platform, but we're really only looking for issues that are # architecture-independent. linux: + # We use a large runner for the additional disk space. runs-on: github-hosted-ubuntu-x64-large steps: - uses: actions/checkout@v4