From e54e0eae38dfaface77dc9fbf1df313dc99aa217 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Sat, 6 Apr 2024 05:42:49 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/workflows/main.yml | 12 ++++++++++++ .github/workflows/prerelease.yml | 12 ++++++++++++ .github/workflows/release.yml | 12 ++++++++++++ .github/workflows/run-acceptance-tests.yml | 12 ++++++++++++ Makefile | 6 ++++++ 5 files changed, 54 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e47dcf2e78..0132d8c0dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,12 @@ jobs: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -209,6 +215,12 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Checkout Scripts Repo uses: actions/checkout@v4 with: diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 98103c19e4..ce77170fb3 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -55,6 +55,12 @@ jobs: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -148,6 +154,12 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Checkout Scripts Repo uses: actions/checkout@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e18fc4b3d..9b5be54437 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,6 +54,12 @@ jobs: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -162,6 +168,12 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Checkout Scripts Repo uses: actions/checkout@v4 with: diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 17471d4dd1..4d12f6303f 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -64,6 +64,12 @@ jobs: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -172,6 +178,12 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Checkout Scripts Repo uses: actions/checkout@v4 with: diff --git a/Makefile b/Makefile index b33bfd59a5..0cc57bcc84 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ only_build: build build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet) build_dotnet: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_dotnet: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_dotnet: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_dotnet: upstream pulumictl get version --language dotnet PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) dotnet --out sdk/dotnet/ @@ -43,6 +44,7 @@ build_dotnet: upstream build_go: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_go: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_go: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_go: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) go --out sdk/go/ cd sdk && go list "$$(grep -e "^module" go.mod | cut -d ' ' -f 2)/go/..." | xargs -I {} bash -c 'go build {} && go clean -i {}' @@ -50,6 +52,7 @@ build_go: upstream build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic) build_java: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_java: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_java: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_java: bin/pulumi-java-gen upstream $(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus cd sdk/java/ && \ @@ -59,6 +62,7 @@ build_java: bin/pulumi-java-gen upstream build_nodejs: VERSION := $(shell pulumictl get version --language javascript) build_nodejs: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_nodejs: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_nodejs: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_nodejs: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) nodejs --out sdk/nodejs/ cd sdk/nodejs/ && \ @@ -71,6 +75,7 @@ build_nodejs: upstream build_python: PYPI_VERSION := $(shell pulumictl get version --language python) build_python: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_python: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_python: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_python: upstream rm -rf sdk/python/ PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) python --out sdk/python/ @@ -143,6 +148,7 @@ tfgen: install_plugins upstream tfgen_no_deps tfgen_no_deps: export PULUMI_HOME := $(WORKING_DIR)/.pulumi tfgen_no_deps: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) tfgen_no_deps: export PULUMI_CONVERT := $(PULUMI_CONVERT) +tfgen_no_deps: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache tfgen_no_deps: export PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION := $(PULUMI_CONVERT) tfgen_no_deps: tfgen_build_only $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER)