From b70ef9c270f6f5574567176a64360bed84995133 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Fri, 17 Jan 2025 17:55:09 -0500 Subject: [PATCH] chore: fix make renovate (#1493) When renovate runs the make renovate target, it fails to deduplicate dependencies because the deduplicator scripts are not installed. This fixes it. --- .ci-mgmt.yaml | 2 +- Makefile | 2 +- scripts/renovate.sh | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 scripts/renovate.sh diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index ebc697f95..95104250f 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -5,7 +5,7 @@ template: generic buildProviderCmd: "OS=$(1) ARCH=$(2) OUT=$(3) yarn --cwd awsx build" testProviderCmd: "yarn --cwd awsx test" -renovateCmd: "yarn --cwd awsx dedupe-deps && make generate_sdks" +renovateCmd: "./scripts/renovate.sh" env: ALT_AWS_ACCESS_KEY_ID: ${{ secrets.ALT_AWS_ACCESS_KEY_ID }} diff --git a/Makefile b/Makefile index 2e300e3fb..df829ba52 100644 --- a/Makefile +++ b/Makefile @@ -377,7 +377,7 @@ provider_dist-darwin-arm64: bin/$(PROVIDER)-v$(VERSION_GENERIC)-darwin-arm64.tar provider_dist-windows-amd64: bin/$(PROVIDER)-v$(VERSION_GENERIC)-windows-amd64.tar.gz provider_dist: provider_dist-linux-amd64 provider_dist-linux-arm64 provider_dist-darwin-amd64 provider_dist-darwin-arm64 provider_dist-windows-amd64 .PHONY: provider_dist-linux-amd64 provider_dist-linux-arm64 provider_dist-darwin-amd64 provider_dist-darwin-arm64 provider_dist-windows-amd64 provider_dist -renovate_cmd = yarn --cwd awsx dedupe-deps && make generate_sdks +renovate_cmd = ./scripts/renovate.sh renovate: $(call renovate_cmd) .PHONY: renovate diff --git a/scripts/renovate.sh b/scripts/renovate.sh new file mode 100755 index 000000000..18cb1ebd3 --- /dev/null +++ b/scripts/renovate.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -euo pipefail + +make generate_sdks +yarn --cwd awsx install --frozen-lockfile +yarn --cwd awsx dedupe-deps