Skip to content

Commit 9525a74

Browse files
authored
.github: Ensure new meta-version release job uses latest branch reference (#1276)
The new meta-version job in the release process was not using the latest branch reference for checkout (similar to release-tag). This fixes the release workflow and resets the meta version to re-run release. Previously: ``` To https://github.com/hashicorp/terraform-plugin-sdk.git ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'https://github.com/hashicorp/terraform-plugin-sdk.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. ```
1 parent 9f76b86 commit 9525a74

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ jobs:
6161
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6262
with:
6363
fetch-depth: 0
64+
# Default input is the SHA that initially triggered the workflow. As we created a new commit in the previous job,
65+
# to ensure we get the latest commit we use the ref for checkout: 'refs/heads/<branch_name>'
66+
ref: ${{ github.ref }}
6467
# Avoid persisting GITHUB_TOKEN credentials as they take priority over our service account PAT for `git push` operations
6568
# More details: https://github.com/actions/checkout/blob/b4626ce19ce1106186ddf9bb20e706842f11a7c3/adrs/0153-checkout-v2.md#persist-credentials
6669
persist-credentials: false

meta/meta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
//
1818
// Deprecated: Use Go standard library [runtime/debug] package build information
1919
// instead.
20-
var SDKVersion = "2.30.0"
20+
var SDKVersion = "2.29.0"
2121

2222
// A pre-release marker for the version. If this is "" (empty string)
2323
// then it means that it is a final release. Otherwise, this is a pre-release

0 commit comments

Comments
 (0)