Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into paramprovider
Browse files Browse the repository at this point in the history
  • Loading branch information
Frassle committed May 9, 2024
2 parents 4445ab8 + 82c546d commit c81ecf8
Show file tree
Hide file tree
Showing 6,195 changed files with 713,686 additions and 238,307 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @pulumi/platform
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/flaky_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Flaky Test
description: Report a test that's flaky
labels: ["kind/flaky-test", "area/engineering"]
body:
- type: textarea
id: test-output
attributes:
label: Test Output
description: Please copy paste the output of the failure of the flaky test here
validations:
required: true
- type: textarea
id: CI Link
attributes:
label: CI Link
description: Please provide a link to the CI job that failed
validations:
required: true
2 changes: 1 addition & 1 deletion .github/scripts/get-changelog
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ fi

>&2 echo "::debug::Merge base ${MERGE_BASE}"

go run github.com/aaronfriel/go-change@v0.1.2 render --filter-since-commit "${MERGE_BASE}" "${@}"
go run github.com/pulumi/go-change@v0.1.3 render --filter-since-commit "${MERGE_BASE}" "${@}"
2 changes: 1 addition & 1 deletion .github/scripts/get-version
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ if [ -n "${CI:-""}" ]; then
fi

# Remove whitespace, this is our version:
tr -d '[:space:]' < "${ROOT}/.version"
tr -d '[:space:]' < "${ROOT}/sdk/.version"
2 changes: 1 addition & 1 deletion .github/scripts/versions.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
replacements:
- type: file
file: .version
file: ./sdk/.version
fileFormat: sed
updatePath: .*
versionFormat: ${SEMVER}
21 changes: 14 additions & 7 deletions .github/workflows/ci-build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:
default: ubuntu-latest
description: 'Build platform (i.e.: runs-on) for job'
type: string
dev-version:
required: false
description: "Dev version to bake into the binary"
type: string
version:
required: true
description: "Version to produce"
Expand All @@ -36,23 +40,24 @@ on:
default: false
required: false
type: boolean
enable-race-detection:
description: "Build binaries with race detection"
default: false
required: false
type: boolean

defaults:
run:
shell: bash

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PULUMI_VERSION: ${{ inputs.version }}

jobs:
build:
name: ${{ inputs.os }}-${{ inputs.arch }}
runs-on: ${{ inputs.build-platform }}

env:
PULUMI_VERSION: ${{ inputs.version }}

permissions:
id-token: write

Expand All @@ -71,14 +76,14 @@ jobs:
echo "$TOOL_BIN" | tee -a "$GITHUB_PATH"
command -v tar
tar --version
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Configure Go Cache Key
env:
CACHE_KEY: "${{ fromJson(inputs.version-set).go }}-${{ runner.os }}-${{ runner.arch }}"
run: echo "$CACHE_KEY" > .gocache.tmp
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: ${{ fromJson(inputs.version-set).go }}
cache: true
Expand Down Expand Up @@ -115,14 +120,16 @@ jobs:
shell: bash
env:
GORELEASER_CURRENT_TAG: v${{ inputs.version }}
PULUMI_VERSION: ${{ inputs.dev-version || inputs.version }}
PULUMI_BUILD_MODE: ${{ inputs.enable-coverage && 'coverage' || 'normal' }}
PULUMI_ENABLE_RACE_DETECTION: ${{ inputs.enable-race-detection && 'true' || 'false' }}
run: |
set -euxo pipefail
# Spurious, this command requires piping via stdin
# shellcheck disable=SC2002
cat .goreleaser.yml \
| go run github.com/t0yv0/goreleaser-filter@v0.3.0 -goos ${{ inputs.os }} -goarch ${{ inputs.arch }} \
| goreleaser release -f - -p 5 --skip-validate --rm-dist --snapshot
| goreleaser release -f - -p 5 --skip-validate --clean --snapshot
- uses: actions/upload-artifact@v2
with:
name: artifacts-cli-${{ inputs.os }}-${{ inputs.arch }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-build-sdks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
name: python
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Setup versioning env vars
Expand All @@ -51,7 +51,7 @@ jobs:
run: |
./scripts/versions.sh | tee -a "${GITHUB_ENV}"
- name: Set up Python ${{ fromJson(inputs.version-set).python }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ fromJson(inputs.version-set).python }}
cache: pip
Expand All @@ -65,7 +65,7 @@ jobs:
rm setup.py.bak
python3 -m venv venv
source venv/bin/activate
python -m pip install wheel
python -m pip install wheel setuptools
python setup.py build bdist_wheel --python-tag py3
- name: Upload pulumi.whl
uses: actions/upload-artifact@v2
Expand All @@ -79,7 +79,7 @@ jobs:
name: nodejs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Setup versioning env vars
Expand All @@ -88,7 +88,7 @@ jobs:
run: |
./scripts/versions.sh | tee -a "${GITHUB_ENV}"
- name: Set up Node ${{ fromJson(inputs.version-set).nodejs }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ fromJson(inputs.version-set).nodejs }}
cache: yarn
Expand Down

0 comments on commit c81ecf8

Please sign in to comment.