Skip to content

Fix: Do not hard code issue-id prefix #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tykeal merged 2 commits into from
Mar 26, 2025
Merged

Fix: Do not hard code issue-id prefix #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ed36ff
Fix: Do not hard code issue-id prefix
askb Mar 21, 2025
990d6d3
Chore: pre-commit autoupdate
pre-commit-ci[bot] Mar 26, 2025
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
7 changes: 2 additions & 5 deletions .github/workflows/github2gerrit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,19 +367,16 @@ jobs:
fi

# Dependabot workaround for LF projects enforcing an "issue-id" in commit message
if [ -n ${{ env.SET_ISSUE_ID }} ]; then
if [[ -n ${{ env.SET_ISSUE_ID }} && '${{ vars.ISSUEID }}' == 'true' ]]; then
# workaround to remove lines with --- or ...
sed -i -e 's#^[ ]*---##g' -e 's#^[ ]*\.\.\.##g' commit-msg.txt
issue_id="Issue-ID: ${{ env.SET_ISSUE_ID }}"
issue_id="${{ env.SET_ISSUE_ID }}"
# shellcheck disable=SC2086
git commit -s -v --no-edit --author "$author" -m "$(cat commit-msg.txt)" -m "$issue_id" -m "$(cat signed-off-by-final.txt)"
else
# shellcheck disable=SC2086
git commit -s -v --no-edit --author "$author" -m "$(cat $commit_message)"
fi

# # shellcheck disable=SC2086
# git commit -s -v --no-edit --author "$author" -m "$(cat $commit_message)"
git log -n1
env:
SET_ISSUE_ID: ${{ env.SET_ISSUE_ID }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Set the following under Organization or repository variables.

## Optional Variables

- `ISSUEID`: Set to `true` to add an `Issue-ID: <ISSUE-NO>` in the commit footer. The variable needs the [`inject-issue-id-action`](https://github.com/lfit/releng-reusable-workflows/tree/main/.github/actions/inject-issue-id-action) action from the releng-reusable-workflows repository.
- `ISSUEID`: Set to `true` to add an `Issue-ID: <ISSUE-NO>` in the commit footer. The variable needs the [`inject-issue-id-action`](https://github.com/lfit/releng-reusable-workflows/tree/main/.github/actions/inject-issue-id-action) action from the releng-reusable-workflows repository. The `inject-issue-id-action` injects the issue-id string into the `env.SET_ISSUE_ID` Github environment variable that is referenced and set into the commit message.

## Optional Inputs

Expand Down