Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ env:
GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
GOOGLE_PROJECT_NUMBER: 895284651812
GOLANGCI_LINT_VERSION: v2.5.0
GOLANGCI_LINT_VERSION: v2.9.0


jobs:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "pulumi"]
path = pulumi
url = https://github.com/pulumi/pulumi
branch = v3.219.0
branch = v3.220.0
3 changes: 2 additions & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tools]
changie = "latest"
golangci-lint = "2.5.0"
go = "1.25"
golangci-lint = "2.9.0"
gradle = "8.14.1"
java = "temurin-11.0.28+6"
maven = "3.9.11"
5 changes: 4 additions & 1 deletion pkg/cmd/pulumi-language-java/language_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ var expectedFailures = map[string]string{
"l1-builtin-project-root": "TODO: call rootDirectory",
"l1-builtin-try": "#1683 Fix l1-builtin-try/can",
"l1-builtin-can": "#1683 Fix l1-builtin-try/can",
"l1-config-types": "compilation error",
"l1-config-types-object": "https://github.com/pulumi/pulumi-java/issues/2005",
"l1-config-types-primitive": "https://github.com/pulumi/pulumi-java/issues/2004",
"l1-keyword-overlap": "#1681 Fix l1-keyword-overlap",
"l1-output-null": "unhandled error occurred",
"l1-output-string": "#1562 Large string literals are not generated correctly",
Expand Down Expand Up @@ -239,8 +240,10 @@ var expectedFailures = map[string]string{
"l2-resource-option-version-sdk": "https://github.com/pulumi/pulumi-java/issues/1996",
"l3-range-resource-output-traversal": "https://github.com/pulumi/pulumi-java/issues/1997",
"l2-resource-option-plugin-download-url": "https://github.com/pulumi/pulumi-java/issues/1999",
"l2-resource-option-env-var-mappings": "https://github.com/pulumi/pulumi-java/issues/2006",
"provider-resource-component": "not implemented",
"provider-alias-component": "not implemented",
"provider-replacement-trigger-component": "https://github.com/pulumi/pulumi-java/issues/2007",
}

// runTestingHost boots up a new instance of the language conformance test runner, `pulumi-test-language`, as well as a
Expand Down
6 changes: 3 additions & 3 deletions pkg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/hashicorp/hcl/v2 v2.24.0
github.com/hexops/autogold/v2 v2.2.1
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v3 v3.219.0
github.com/pulumi/pulumi/sdk/v3 v3.219.0
github.com/pulumi/pulumi/pkg/v3 v3.220.0
github.com/pulumi/pulumi/sdk/v3 v3.220.0
github.com/spf13/cobra v1.10.1
github.com/stretchr/testify v1.10.0
github.com/zclconf/go-cty v1.17.0
Expand Down Expand Up @@ -142,7 +142,7 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.21.0 // indirect
github.com/pulumi/esc v0.22.0 // indirect
github.com/pulumi/inflector v0.2.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions pkg/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435cARxCW6q9gc0S/Yxz7Mkd38pOb0=
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
github.com/pulumi/esc v0.21.0 h1:TR8Ff22SU+z8cooTmUKkmk2FltXW/wDPrIwI9BP88Vk=
github.com/pulumi/esc v0.21.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE=
github.com/pulumi/esc v0.22.0 h1:Kbk0kIPsoIu6vnLgKtiE8AKRfl8B8bg6adiQuwJiBjA=
github.com/pulumi/esc v0.22.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE=
github.com/pulumi/inflector v0.2.1 h1:bqyiish3tq//vLeLiEstSFE5K7RNjy/ce47ed4QATu8=
github.com/pulumi/inflector v0.2.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
github.com/pulumi/pulumi/pkg/v3 v3.219.0 h1:Tr1xOszG65cwFx+TDk3/McXdyKXOH5KIbuj/u4eIBzI=
github.com/pulumi/pulumi/pkg/v3 v3.219.0/go.mod h1:cxmMnghuTrmDGqO+kMTFisJQ5WTIfS+i01Eang6zKKI=
github.com/pulumi/pulumi/sdk/v3 v3.219.0 h1:OwTSwk1ZuOI4hQUdSccWuIAuqs4fL/FcppesPOAKHQ8=
github.com/pulumi/pulumi/sdk/v3 v3.219.0/go.mod h1:ZOBPPC2NZOZf729AdCX+CctfNc5SN6aJh0bdqNdzQC4=
github.com/pulumi/pulumi/pkg/v3 v3.220.0 h1:M2mg8ohi8HEceoub+5YSNxCgQ6WY/ycdeMzc0uZmlWI=
github.com/pulumi/pulumi/pkg/v3 v3.220.0/go.mod h1:RjLYZtdMcBn6qmAWF5HFy4Xw8U/nwsL9QdirtETkarU=
github.com/pulumi/pulumi/sdk/v3 v3.220.0 h1:TtdlW2VfvBWhFZSvaDN9lSUlSS4gGSdNWdca3RGPsBQ=
github.com/pulumi/pulumi/sdk/v3 v3.220.0/go.mod h1:UGWJOz25OiFIN0QH79UFij8mffH94TYebKUgy9Wvug0=
github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package version
package version //nolint: revive

// Version is initialized by the Go linker to contain the semver of this build.
var Version string
2 changes: 1 addition & 1 deletion pulumi
Submodule pulumi updated 1338 files
Loading