diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 192c338a31..591770dbc8 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -15,7 +15,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags shell: bash diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index ac1ce374f0..cb26b64bf0 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: peter-evans/slash-command-dispatch@v2 with: commands: | diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml index 68eb7f6d99..4c3414b904 100644 --- a/.github/workflows/community-moderation.yml +++ b/.github/workflows/community-moderation.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: schema_changed name: Check for diff in schema uses: dorny/paths-filter@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 56b2be8041..c42899ca99 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install go uses: actions/setup-go@v4 with: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3b94e566b2..f2db644a0b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -42,12 +42,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -57,8 +58,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -142,7 +144,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -150,10 +152,11 @@ jobs: aws-region: us-west-2 aws-secret-access-key: ${{ secrets.AWS_CORP_S3_UPLOAD_SECRET_ACCESS_KEY }} - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -163,8 +166,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -172,7 +176,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Echo Coverage Output Dir @@ -201,12 +205,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -216,8 +221,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -225,7 +231,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -283,7 +289,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -293,8 +299,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -372,12 +379,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -387,8 +395,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml index 643b88e1f9..6afc863ad5 100644 --- a/.github/workflows/nightly-test.yml +++ b/.github/workflows/nightly-test.yml @@ -42,12 +42,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -57,8 +58,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -139,12 +141,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -154,8 +157,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -163,7 +167,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -222,12 +226,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -237,8 +242,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 5089023079..6d9b82c6bc 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -43,12 +43,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -58,8 +59,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -146,12 +148,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -161,8 +164,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -170,7 +174,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -228,7 +232,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -238,8 +242,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -299,12 +304,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -314,8 +320,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 31deeaafbb..773cc84d33 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Comment PR uses: thollander/actions-comment-pull-request@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ba97fc542..a4bf81401e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,12 +42,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -57,8 +58,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -138,8 +140,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - env: GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} @@ -159,12 +162,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -174,8 +178,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -183,7 +188,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -241,7 +246,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -251,8 +256,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -308,10 +314,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Add SDK version tag run: git tag "sdk/v$(pulumictl get version --language generic)" && git push origin @@ -345,12 +352,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -360,8 +368,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/release_command.yml b/.github/workflows/release_command.yml index 8b39c586b1..2a8fff366c 100644 --- a/.github/workflows/release_command.yml +++ b/.github/workflows/release_command.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Should release PR uses: pulumi/action-release-by-pr-label@main with: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 6f228126dc..b80c6edbbb 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -43,9 +43,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-mgmt repository: pulumi/ci-mgmt @@ -61,8 +61,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index ad0ce7f5d4..4bbd232421 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -50,14 +50,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -67,8 +68,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -171,12 +173,13 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -186,8 +189,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -195,7 +199,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -295,14 +299,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -312,8 +317,9 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 09d7ad85fe..7a5ed4a55a 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -97,7 +97,7 @@ start_rebase() { echo "Applying $patch" if ! git am --3way "$patch"; then echo - echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" + echo "Failed to apply ${patch}. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" echo exit 1 fi @@ -145,7 +145,7 @@ apply() { if ! git apply --3way "$patch"; then cat <