Skip to content

Commit c39c8a7

Browse files
authored
Manually run ci-mgmt and fix test (#1964)
fixes #1946 <!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md) for Pulumi's contribution guidelines. Help us merge your changes more quickly by adding more details such as labels, milestones, and reviewers.--> ### Proposed changes <!--Give us a brief description of what you've done and what it solves. --> ### Related issues (optional) <!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'. Or link to full URLs to issues or pull requests in other GitHub repositories. -->
1 parent 446e513 commit c39c8a7

File tree

26 files changed

+368
-230
lines changed

26 files changed

+368
-230
lines changed

.ci-mgmt.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ major-version: 4
55
template: generic
66
test-folder: tests
77

8+
freeDiskSpaceBeforeTest: true
9+
810
buildProviderCmd: "OS=$(1) ARCH=$(2) OUT=$(3) yarn --cwd nodejs/eks build"
911
renovateCmd: "./scripts/renovate.sh"
1012
shards: 25 # number of shards to use for parallel testing across all languages.
@@ -13,7 +15,6 @@ env:
1315
AWS_REGION: us-west-2
1416
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1517
GOLANGCI_LINT_VERSION: v1.64.8
16-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
1718
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1819
PROVIDER: eks
1920
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.config/mise.lock

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[[tools.dotnet]]
2+
version = "8.0.414"
3+
backend = "asdf:dotnet"
4+
5+
[[tools."github:pulumi/pulumictl"]]
6+
version = "0.0.50"
7+
backend = "github:pulumi/pulumictl"
8+
9+
[[tools."github:pulumi/schema-tools"]]
10+
version = "0.6.0"
11+
backend = "github:pulumi/schema-tools"
12+
13+
[[tools.go]]
14+
version = "1.24.2"
15+
backend = "core:go"
16+
17+
[[tools.golangci-lint]]
18+
version = "1.64.8"
19+
backend = "aqua:golangci/golangci-lint"
20+
21+
[[tools.gradle]]
22+
version = "7.6.6"
23+
backend = "aqua:gradle/gradle"
24+
25+
[[tools.java]]
26+
version = "corretto-11.0.29.7.1"
27+
backend = "core:java"
28+
29+
[[tools.node]]
30+
version = "20.19.5"
31+
backend = "core:node"
32+
33+
[[tools."npm:yarn"]]
34+
version = "1.22.22"
35+
backend = "npm:yarn"
36+
37+
[[tools.pulumi]]
38+
version = "3.173.0"
39+
backend = "aqua:pulumi/pulumi"
40+
41+
[tools.pulumi.platforms.macos-arm64]
42+
checksum = "sha512:6fca876022e812879ccff0d81f26ac269f06bf4d8ce8d4e492f20bdfbb0fa9255b7ab8752935e42bc5dd14470acef8a2a279ad1bd130a6355b84cbaccdc72171"
43+
size = 83950975
44+
url = "https://github.com/pulumi/pulumi/releases/download/v3.173.0/pulumi-v3.173.0-darwin-arm64.tar.gz"
45+
46+
[[tools.python]]
47+
version = "3.11.8"
48+
backend = "core:python"

.config/mise.test.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt
2+
3+
# Overrides for test workflows
4+
5+
[env]
6+
# Acceptance (specifically providertest) tests require that PULUMI_HOME be the default
7+
PULUMI_HOME = "{{ env.HOME }}/.pulumi"
8+
9+
[tools]
10+
# always use pulumi latest for tests
11+
pulumi = "latest"

.config/mise.toml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt
2+
# You can create your own root-level mise.toml file to override/augment this. See https://mise.jdx.dev/configuration.html
3+
4+
[env]
5+
_.source = "{{config_root}}/scripts/get-versions.sh"
6+
PULUMI_HOME = "{{config_root}}/.pulumi"
7+
8+
[tools]
9+
10+
# Runtimes
11+
# TODO: we may not need 'get_env' once https://github.com/jdx/mise/discussions/6339 is fixed
12+
go = "{{ get_env(name='GO_VERSION_MISE', default='latest') }}"
13+
node = '20.19.5'
14+
python = '3.11.8'
15+
dotnet = '8.0.414'
16+
# Corretto version used as Java SE/OpenJDK version no longer offered
17+
java = 'corretto-11'
18+
19+
# Executable tools
20+
pulumi = "{{ get_env(name='PULUMI_VERSION_MISE', default='latest') }}"
21+
"github:pulumi/pulumictl" = 'latest'
22+
"github:pulumi/schema-tools" = "latest"
23+
gradle = '7.6'
24+
golangci-lint = "1.64.8" # See note about about overrides if you need to customize this.
25+
"npm:yarn" = "1.22.22"
26+
27+
[settings]
28+
experimental = true # Required for Go binaries (e.g. pulumictl).
29+
lockfile = true

.github/actions/download-prerequisites/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: "composite"
66
steps:
77
- name: Download the prerequisites bin
8-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
8+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
99
with:
1010
name: prerequisites-bin
1111
path: bin
@@ -19,7 +19,7 @@ runs:
1919
run: rm bin/executables.txt
2020

2121
- name: Download schema-embed.json
22-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
22+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
2323
with:
2424
# Use a pattern to avoid failing if the artifact doesn't exist
2525
pattern: schema-embed.*

.github/actions/download-provider/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
steps:
77

88
- name: Download pulumi-resource-eks
9-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
9+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
1010
with:
1111
pattern: pulumi-resource-eks-*-linux-amd64.tar.gz
1212
path: ${{ github.workspace }}/bin

.github/actions/download-sdk/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: "composite"
1111
steps:
1212
- name: Download ${{ inputs.language }} SDK
13-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
13+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
1414
with:
1515
name: ${{ inputs.language }}-sdk.tar.gz
1616
path: ${{ github.workspace}}/sdk/

.github/actions/setup-tools/action.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

.github/actions/upload-prerequisites/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ runs:
99
run: find bin -type f -executable > bin/executables.txt
1010

1111
- name: Upload prerequisites bin
12-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
12+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
1313
with:
1414
name: prerequisites-bin
1515
path: bin/*
1616
retention-days: 30
1717

1818
- name: Upload schema-embed.json
19-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
19+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2020
with:
2121
name: schema-embed.json
2222
path: provider/cmd/pulumi-resource-eks/schema-embed.json

.github/actions/upload-sdk/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
shell: bash
1414
run: tar -zcf sdk/${{ inputs.language }}.tar.gz -C sdk/${{ inputs.language }} .
1515
- name: Upload artifacts
16-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
16+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
1717
with:
1818
name: ${{ inputs.language }}-sdk.tar.gz
1919
path: ${{ github.workspace}}/sdk/${{ inputs.language }}.tar.gz

0 commit comments

Comments
 (0)