From 6a84dc20e4f91f53037f046af6a37dd3bf14ecec Mon Sep 17 00:00:00 2001 From: Timothy Myers Date: Fri, 17 Apr 2020 15:14:18 -0600 Subject: [PATCH] fix: semantic-release 4 --- .github/workflows/release.yml | 5 +++++ .goreleaser.yml | 4 +++- .releaserc.json | 6 ++---- Makefile | 7 +++++-- sdk/nodejs/package.json | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aecda78..4e412b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,11 @@ jobs: uses: pulumi/action-install-tf2pulumi@releases/v1 with: tf2pulumi-version: 0.6.0 + - name: Install goreleaser + uses: goreleaser/goreleaser-action@v1 + with: + version: latest + args: --version - name: Ensure dependencies run: make ensure - name: Semantic release diff --git a/.goreleaser.yml b/.goreleaser.yml index d7d5801..541db6a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -4,6 +4,8 @@ env: - GO111MODULE=on before: hooks: +release: + disable: true builds: - env: - CGO_ENABLED=0 @@ -20,6 +22,6 @@ builds: snapshot: name_template: "{{ .Tag }}-SNAPSHOT" archives: - - name_template: "{{ .Binary }}-}}-{{ .Os }}-{{ .Arch }}" + - name_template: "{{ .Binary }}-v{{ .Tag }}-{{ .Os }}-{{ .Arch }}" files: [] # Empty diff --git a/.releaserc.json b/.releaserc.json index 1ceac04..69c202f 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -4,12 +4,10 @@ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", ["@semantic-release/exec", { - "prepareCmd": "VERSION=${nextRelease.version} make provider", - "publishCmd": "VERSION=${nextRelease.version} make publish_provider" + "publishCmd": "VERSION=${nextRelease.version} make build_provider" }], ["@semantic-release/exec", { - "prepareCmd": "VERSION=${nextRelease.version} make build_node", - "publishCmd": "VERSION=${nextRelease.version} make publish_node" + "publishCmd": "VERSION=${nextRelease.version} make build_node && make publish_node" }], ["@semantic-release/github", { "released": ["published"] diff --git a/Makefile b/Makefile index 41f632f..80557fe 100644 --- a/Makefile +++ b/Makefile @@ -34,11 +34,11 @@ build_node:: tfgen provider cd ${PACKDIR}/nodejs/ && \ yarn install && \ yarn run tsc && \ - sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" -e "s/\$${PLUGIN_VERSION}/$(VERSION)/g" ./package.json && \ + sed -e "s/\$${VERSION}/$(VERSION)/g" -e "s/\$${PLUGIN_VERSION}/$(VERSION)/g" ./package.json && \ cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ publish_node:: build_node - yarn --cwd sdk/nodejs/bin publish --access public + yarn --cwd sdk/nodejs/bin publish --access public && git clean -fd build_python:: tfgen provider cd provider && ./bin/$(TFGEN) python --overlays overlays/python --out ../${PACKDIR}/python/ @@ -68,6 +68,9 @@ provider:: generate_schema cd provider && go generate ${PROJECT}/provider/cmd/${PROVIDER} cd provider && go install -ldflags "-X github.com/${ORG}/pulumi-${PACK}/provider/pkg/version.Version=${VERSION}" ${PROJECT}/provider/cmd/${PROVIDER} +build_provider:: provider + goreleaser release + publish_provider:: provider lint:: diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index 3024bed..85a9701 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@timmyers/pulumi-github", - "version": "0.0.3", + "version": "0.0.5", "description": "A Pulumi package for creating and managing github cloud resources.", "keywords": [ "pulumi",