Skip to content

Commit c1a00e1

Browse files
committed
Set shell to bash in Makefile. Fix lint error.
1 parent 538f470 commit c1a00e1

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

.github/workflows/push.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ jobs:
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747

48+
- name: Lint
49+
run: |
50+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.2
51+
make lint
52+
4853
- name: Generate schema and build SDKs
4954
run: make gen generate_schema build
5055

.github/workflows/release.yml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,9 @@ jobs:
3131
with:
3232
go-version: 1.18.x
3333

34-
- uses: golangci/golangci-lint-action@v3
35-
# Although some of these inputs are not required, they are still
36-
# being falsely flagged as required by the GitHub Actions
37-
# VS Code extension.
38-
with:
39-
version: latest
40-
working-directory: provider
41-
args: -c ../.golangci.yml --timeout 10m
42-
github-token: ${{ github.token }}
43-
only-new-issues: false
44-
skip-build-cache: false
45-
skip-cache: false
46-
skip-pkg-cache: false
47-
48-
- uses: golangci/golangci-lint-action@v3
49-
with:
50-
version: latest
51-
working-directory: sdk
52-
args: -c ../.golangci.yml --timeout 10m
53-
github-token: ${{ github.token }}
54-
only-new-issues: false
55-
skip-build-cache: false
56-
skip-cache: false
57-
skip-pkg-cache: false
34+
- run: |
35+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.2
36+
make lint
5837
5938
publish-binary:
6039
name: Publish binary

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
PROJECT_NAME := Pulumi Render Resource Provider
22

3+
SHELL = /bin/bash
4+
35
PACK := render
46
PACKDIR := sdk
57
PROJECT := github.com/cloudy-sky-software/pulumi-render

provider/pkg/provider/provider_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ func TestDiff(t *testing.T) {
5151
}
5252

5353
func TestGetResourceState(t *testing.T) {
54+
val := "Testing"
5455
outputs := make(map[string]interface{})
55-
outputs["name"] = "Test"
56+
outputs["name"] = val
5657
outputs["id"] = "someid"
5758

5859
inputs := make(map[string]interface{})
59-
inputs["name"] = "Test"
60+
inputs["name"] = val
6061

6162
state := getResourceState(outputs, resource.NewPropertyMapFromMap(inputs))
6263
assert.True(t, state.HasValue(resource.PropertyKey(stateKeyInputs)))

0 commit comments

Comments
 (0)