Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d651fbc
change to node20 for all actions
nickfyson Nov 22, 2023
f2d0c2e
upgrade node type definitions
nickfyson Dec 7, 2023
5b19bef
change to node20 for all actions
nickfyson Dec 7, 2023
5b52b36
reintroduce PR check that confirm action can be still be compiled on …
nickfyson Dec 7, 2023
cc4fead
update version in various hardcoded locations
nickfyson Dec 7, 2023
3a9f6a8
update javascript files
nickfyson Dec 7, 2023
303dec0
fix choice of older node version to test
nickfyson Dec 7, 2023
bf51594
Update checked-in dependencies
github-actions[bot] Dec 7, 2023
95be4b2
add not about continuing testing on node 16
nickfyson Dec 7, 2023
0bc194e
switch check sarif action to node20
nickfyson Dec 11, 2023
1de8705
Merge branch 'main' into nickfyson/node-20
nickfyson Dec 12, 2023
691226e
Update changelog and version after v2.22.10
github-actions[bot] Dec 12, 2023
1bca5bf
Update checked-in dependencies
github-actions[bot] Dec 12, 2023
3c1878d
Merge pull request #2029 from github/mergeback/v2.22.10-to-main-305f6546
cklin Dec 12, 2023
b995212
Bump the actions group with 2 updates (#2024)
dependabot[bot] Dec 12, 2023
b974542
Merge branch 'main' into nickfyson/node-20
nickfyson Dec 13, 2023
ea1e72c
Update .github/workflows/pr-checks.yml
nickfyson Dec 13, 2023
6b5b958
remove dedundant single quotes from node version strings
nickfyson Dec 13, 2023
7898bc2
add pr check for node version consistency
nickfyson Dec 13, 2023
c757f9f
Apply suggestions from code review
nickfyson Dec 13, 2023
64e61ba
Merge pull request #2006 from github/nickfyson/node-20
nickfyson Dec 13, 2023
e2b5cc7
Update changelog for v3.22.11
github-actions[bot] Dec 13, 2023
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
Prev Previous commit
Next Next commit
add pr check for node version consistency
  • Loading branch information
nickfyson committed Dec 13, 2023
commit 7898bc2041d7b0bc5e6f97169b127ff75eee02f2
5 changes: 4 additions & 1 deletion .github/update-release-branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,13 @@ def main():
print(f'No commits to merge from {source_branch} to {target_branch}.')
return

# define distinct prefix in order to support specific pr checks on backports
branch_prefix = 'update' if is_primary_release else 'backport'

# The branch name is based off of the name of branch being merged into
# and the SHA of the branch being merged from. Thus if the branch already
# exists we can assume we don't need to recreate it.
new_branch_name = f'update-v{version}-{source_branch_short_sha}'
new_branch_name = f'{branch_prefix}-v{version}-{source_branch_short_sha}'
print(f'Branch name is {new_branch_name}.')

# Check if the branch already exists. If so we can abort as this script
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,44 @@ jobs:
# we won't be able to find them on Windows.
npm config set script-shell bash
npm test

check-node-version:
if: ${{ github.event.pull_request }}
name: Check node version consistency
runs-on: ubuntu-latest
timeout-minutes: 45
env:
BASE_REF: ${{ github.base_ref }}

steps:
- uses: actions/checkout@v4
- id: head-version
name: check HEAD node version
run: |
NODE_VERSION=$(find . -name "action.yml" -exec yq -e '.runs.using' {} \; | grep node | sort | uniq)
echo "NODE_VERSION: ${NODE_VERSION}"
if [[ $(echo "$NODE_VERSION" | wc -l) -gt 1 ]]; then
echo "Error: More than one node version used in actions."
exit 1
fi
echo "node_version=${NODE_VERSION}" >> $GITHUB_OUTPUT

- id: checkout-base
name: check out base ref for backport check
if: ${{ startsWith(github.head_ref, 'backport-') }}
uses: actions/checkout@v4
with:
ref: ${{ env.BASE_REF }}

- name: compare with node version on base ref for backport check
if: steps.checkout-base.outcome == 'success'
env:
HEAD_VERSION: ${{ steps.head-version.outputs.node_version }}
run: |
BASE_VERSION=$(find . -name "action.yml" -exec yq -e '.runs.using' {} \; | grep node | sort | uniq)
echo "HEAD_VERSION: ${HEAD_VERSION}"
echo "BASE_VERSION: ${BASE_VERSION}"
if [[ "$BASE_VERSION" != "$HEAD_VERSION" ]]; then
echo "Error: Cannot change node version in a backport PR."
exit 1
fi