mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-07 22:54:11 -05:00
hwloc 2.12.1 -> 2.12.2 — hwloc: 2.12.1 → 2.12.2 (#13560)
* hwloc 2.12.1 -> 2.12.2 * Adjust workflow... Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust workflow... Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust workflow... Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Zopolis4 <creatorsmithmdt@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
committed by
GitHub
parent
1d3c140ca8
commit
c43db62ef8
27
.github/workflows/Generate-PR.yml
vendored
27
.github/workflows/Generate-PR.yml
vendored
@@ -12,11 +12,6 @@ on:
|
||||
pr_title:
|
||||
description: "Title of PR"
|
||||
required: false
|
||||
update_rebase_to_master:
|
||||
description: "Update Branch."
|
||||
required: false
|
||||
type: boolean
|
||||
default: 'false'
|
||||
update_package_files:
|
||||
description: "Update Package Files."
|
||||
required: false
|
||||
@@ -85,16 +80,14 @@ jobs:
|
||||
echo "Setting ${PR_NUMBER} to Draft while workflow runs."
|
||||
gh pr ready --undo || true
|
||||
fi
|
||||
if [[ "${{ ( inputs.update_rebase_to_master ) }}" == 'true' ]]; then
|
||||
if [[ -n ${PR_NUMBER} ]]; then
|
||||
# Try to update branch immediately.
|
||||
gh pr update-branch || true
|
||||
else
|
||||
gh pr create -d -b WIP -t "WIP ${{ inputs.branch || github.ref_name }}"
|
||||
# Create a draft PR and immediately try to update the branch
|
||||
# before continuing.
|
||||
gh pr update-branch || true
|
||||
fi
|
||||
if [[ -n ${PR_NUMBER} ]]; then
|
||||
# Try to update branch immediately.
|
||||
gh pr update-branch || true
|
||||
else
|
||||
gh pr create -d -b WIP -t "WIP ${{ inputs.branch || github.ref_name }}"
|
||||
# Create a draft PR and immediately try to update the branch
|
||||
# before continuing.
|
||||
gh pr update-branch || true
|
||||
fi
|
||||
- name: Get changed files
|
||||
id: changed-files
|
||||
@@ -438,12 +431,14 @@ jobs:
|
||||
git config user.email "${{ github.actor }}@users.noreply.github.com"
|
||||
git checkout master && git fetch origin master
|
||||
git checkout "${{ inputs.branch || github.ref_name }}"
|
||||
git fetch origin "${{ inputs.branch || github.ref_name }}"
|
||||
git log --no-merges --oneline -10
|
||||
git log --no-merges --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Merge branch 'master'\|Build Run on\|Package File Update Run on\|lint$" | tr '\n' '\0' | xargs -0 -n1 echo "- $*" >> /tmp/commits.txt
|
||||
- name: Get Current HEAD hash
|
||||
id: get-current-head
|
||||
run: |
|
||||
echo "CURRENT_HEAD=$(git ls-remote https://github.com/${{ github.repository }}.git | head -1 | sed 's/HEAD//')" >> "$GITHUB_OUTPUT"
|
||||
echo "CURRENT_HEAD is $(git ls-remote https://github.com/${{ github.repository }}.git | head -1 | sed 's/HEAD//')"
|
||||
- name: Get changed files
|
||||
id: changed-files
|
||||
uses: tj-actions/changed-files@v47
|
||||
@@ -558,7 +553,7 @@ jobs:
|
||||
gh pr edit --add-reviewer chromebrew/active $PR_EDIT_LABEL_FLAG --title "$(echo "${PR_TITLE}" | sed -e "s/^'//" -e "s/'$//") ${PKG_DELTAS}" -F /tmp/pr.txt
|
||||
fi
|
||||
# Try to update branch before finishing.
|
||||
[[ "${{ ( inputs.update_rebase_to_master ) }}" == 'true' ]] && gh pr update-branch --rebase || true
|
||||
gh pr update-branch --rebase || true
|
||||
# Check to see if the PR is marked as WIP, in which case it should stay as draft.
|
||||
if gh pr list -l "wip 🚧" --json number | jq --arg PR_NUMBER "$PR_NUMBER" -e -r '.[]|select(.number=='$PR_NUMBER')' &>/dev/null; then
|
||||
echo "PR ${PR_NUMBER} is set as WIP, so will be set or kept as Draft."
|
||||
|
||||
Reference in New Issue
Block a user