From d881f0654c466cd81f8ec579a9bcfff41736b9b6 Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Tue, 6 Feb 2024 17:05:01 -0600 Subject: [PATCH] try zig 0.12.0-dev --- .github/workflows/goreleaser-build-publish-develop.yml | 2 +- .goreleaser.develop.yaml | 8 ++++---- .tool-versions | 2 +- core/chainlink.goreleaser.Dockerfile | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/goreleaser-build-publish-develop.yml b/.github/workflows/goreleaser-build-publish-develop.yml index 6c31268d57a..a49501fdcb3 100644 --- a/.github/workflows/goreleaser-build-publish-develop.yml +++ b/.github/workflows/goreleaser-build-publish-develop.yml @@ -35,7 +35,7 @@ jobs: goreleaser-exec: ./tools/bin/goreleaser_wrapper goreleaser-config: .goreleaser.develop.yaml goreleaser-key: ${{ secrets.GORELEASER_KEY }} - # zig-version: 0.11.0 + zig-version: 0.12.0-dev.2619+5cf138e51 - name: Collect Metrics if: always() id: collect-gha-metrics diff --git a/.goreleaser.develop.yaml b/.goreleaser.develop.yaml index 35efc363f4e..188375ff813 100644 --- a/.goreleaser.develop.yaml +++ b/.goreleaser.develop.yaml @@ -23,8 +23,8 @@ builds: - arm64 env: - CGO_ENABLED=1 - - CC=zig cc -target aarch64-linux-gnu - - CCX=zig c++ -target aarch64-linux-gnu + - CC=$ZIG_EXEC cc -target aarch64-linux-gnu + - CCX=$ZIG_EXEC c++ -target aarch64-linux-gnu flags: - -trimpath - -buildmode=pie @@ -40,8 +40,8 @@ builds: - amd64 env: - CGO_ENABLED=1 - - CC=zig cc -target x86_64-linux-gnu - - CCX=zig c++ -target x86_64-linux-gnu + - CC=$ZIG_EXEC cc -target x86_64-linux-gnu + - CCX=$ZIG_EXEC c++ -target x86_64-linux-gnu flags: - -trimpath - -buildmode=pie diff --git a/.tool-versions b/.tool-versions index d8f0afd901d..4408c18e7d5 100644 --- a/.tool-versions +++ b/.tool-versions @@ -3,5 +3,5 @@ mockery 2.38.0 nodejs 16.16.0 postgres 13.3 helm 3.10.3 -zig 0.10.1 +zig 0.12.0-dev.2619+5cf138e51 golangci-lint 1.55.2 diff --git a/core/chainlink.goreleaser.Dockerfile b/core/chainlink.goreleaser.Dockerfile index 32a1094717e..9e208b1907b 100644 --- a/core/chainlink.goreleaser.Dockerfile +++ b/core/chainlink.goreleaser.Dockerfile @@ -6,7 +6,6 @@ FROM ubuntu:20.04 ARG CHAINLINK_USER=root ARG TARGETARCH ENV DEBIAN_FRONTEND noninteractive -ENV LD_LIBRARY_PATH /usr/local/bin/libs:$LD_LIBRARY_PATH RUN apt-get update && apt-get install -y ca-certificates gnupg lsb-release curl # Install Postgres for CLI tools, needed specifically for DB backups