Skip to content

tools: avoid rewriting same-version OpenSSL updates #66999

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

Open
panva wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

tools: avoid rewriting same-version OpenSSL updates #66999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion .github/workflows/update-openssl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ jobs:
env:
TARGET_BRANCH: ${{ github.ref_name }}
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
PR_BRANCH: actions/${{ github.ref_name != github.event.repository.default_branch && format('{0}/', github.ref_name) || '' }}tools-update-openssl
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0
persist-credentials: false
- name: Setup Git config
run: |
Expand All @@ -37,6 +39,13 @@ jobs:
if [ "$TARGET_BRANCH" != "$DEFAULT_BRANCH" ]; then
echo "PR_TITLE_PREFIX=[${TARGET_BRANCH%-staging}] " >> "$GITHUB_ENV"
fi
- name: Apply existing OpenSSL update
if: github.event_name != 'workflow_dispatch'
run: |
if git show-ref --verify --quiet "refs/remotes/origin/$PR_BRANCH" &&
! git merge-base --is-ancestor "origin/$PR_BRANCH" HEAD; then
git cherry-pick --empty=drop "HEAD..origin/$PR_BRANCH"
fi
- name: Check and download new OpenSSL version
run: |
./tools/dep_updaters/update-openssl.sh download \
Expand Down Expand Up @@ -72,6 +81,6 @@ jobs:
author: Node.js GitHub Bot <github-bot@iojs.org>
committer: Node.js GitHub Bot <github-bot@iojs.org>
body: This is an automated update of OpenSSL to ${{ env.NEW_VERSION }} for ${{ github.ref_name }}.
branch: actions/${{ github.ref_name != github.event.repository.default_branch && format('{0}/', github.ref_name) || '' }}tools-update-openssl
branch: ${{ env.PR_BRANCH }}
labels: dependencies, openssl
title: '${{ env.PR_TITLE_PREFIX }}deps: update OpenSSL to ${{ env.NEW_VERSION }}'
Loading