Skip to content

Commit 5a6a6f4

Browse files
padelsbachpadelsbach
committed
Improvements to patch testing
1 parent 96f1fdb commit 5a6a6f4

3 files changed

Lines changed: 190 additions & 52 deletions

File tree

‎.github/workflows/jni-patched-ci.yml‎

Lines changed: 99 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25-
- name: Resolve wolfSSL ref from patch defines
26-
id: resolve
25+
- name: Find patch defines
26+
id: find_defines
2727
run: |
2828
set -euo pipefail
29-
30-
# Find WOLFSSL_PR*_PATCH_APPLIED defines in wolfssl source.
3129
defines="$(./scripts/find-wolfssl-pr-patch-defines.sh)"
3230
if [ -z "$defines" ]; then
3331
echo "::warning::No WOLFSSL_PR*_PATCH_APPLIED defines found; skipping patched CI."
@@ -36,49 +34,115 @@ jobs:
3634
fi
3735
echo "Found patch defines:"
3836
printf "%s\n" "$defines"
37+
{
38+
echo "should_run=true"
39+
echo "defines<<EOF"
40+
printf "%s\n" "$defines"
41+
echo "EOF"
42+
} >> "$GITHUB_OUTPUT"
43+
44+
- name: Evaluate PR statuses
45+
id: eval_prs
46+
if: steps.find_defines.outputs.should_run == 'true'
47+
run: |
48+
set -euo pipefail
3949
40-
# Find the highest PR number from the defines.
41-
pr_number="$(printf "%s\n" "$defines" | sed -E 's/^WOLFSSL_PR([0-9]+)_PATCH_APPLIED$/\1/' | sort -n | tail -1)"
42-
if [ -z "$pr_number" ]; then
43-
echo "::warning::Failed to derive PR number from patch defines; skipping patched CI."
44-
echo "should_run=false" >> "$GITHUB_OUTPUT"
45-
exit 0
46-
fi
47-
echo "Highest PR number from defines: $pr_number"
50+
defines="${{ steps.find_defines.outputs.defines }}"
51+
merged_all=true
52+
open_count=0
53+
open_repo=""
54+
open_ref=""
55+
open_pr=""
56+
has_invalid=false
4857
49-
# Check PR status via GitHub API.
50-
pr_json="$(curl -fsSL "https://api.github.com/repos/wolfSSL/wolfssl/pulls/$pr_number" || true)"
51-
if [ -z "$pr_json" ]; then
52-
echo "::warning::Unable to fetch PR #$pr_number from GitHub API; skipping patched CI."
53-
echo "should_run=false" >> "$GITHUB_OUTPUT"
54-
exit 0
55-
fi
56-
echo "Fetched PR #$pr_number info from GitHub API."
58+
echo "Evaluating patch defines:"
59+
printf "%s\n" "$defines"
60+
61+
while read -r define; do
62+
[ -z "$define" ] && continue
63+
pr_number="$(printf "%s" "$define" | sed -E 's/^WOLFSSL_PR([0-9]+)_PATCH_APPLIED$/\\1/')"
64+
if [ -z "$pr_number" ] || [ "$pr_number" = "$define" ]; then
65+
echo "::warning::Failed to derive PR number from define $define; skipping patched CI."
66+
echo "should_run=false" >> "$GITHUB_OUTPUT"
67+
exit 0
68+
fi
69+
70+
fork_ref_status="$(./scripts/find-pr-fork-branch.sh "$pr_number" --repo wolfSSL/wolfssl || true)"
71+
if [ -z "$fork_ref_status" ]; then
72+
echo "::warning::Unable to resolve PR #$pr_number fork/branch; skipping patched CI."
73+
echo "should_run=false" >> "$GITHUB_OUTPUT"
74+
exit 0
75+
fi
76+
77+
fork_ref="$(printf "%s" "$fork_ref_status" | sed -E 's/ \\([^)]*\\)$//')"
78+
pr_status="$(printf "%s" "$fork_ref_status" | sed -E 's/^.* \\(([^)]*)\\)$/\\1/')"
79+
80+
head_repo="${fork_ref%/*}"
81+
head_ref="${fork_ref#*/}"
82+
if [ -z "$head_repo" ] || [ -z "$head_ref" ] || [ "$head_repo" = "$head_ref" ]; then
83+
echo "::warning::Malformed fork/branch from helper script; skipping patched CI."
84+
echo "should_run=false" >> "$GITHUB_OUTPUT"
85+
exit 0
86+
fi
87+
88+
if [ "$pr_status" = "merged" ]; then
89+
continue
90+
elif [ "$pr_status" = "open" ]; then
91+
merged_all=false
92+
open_count=$((open_count + 1))
93+
open_repo="$head_repo"
94+
open_ref="$head_ref"
95+
open_pr="$pr_number"
96+
else
97+
merged_all=false
98+
has_invalid=true
99+
fi
100+
done <<EOF
101+
$defines
102+
EOF
103+
104+
{
105+
echo "MERGED_ALL=$merged_all"
106+
echo "OPEN_COUNT=$open_count"
107+
echo "OPEN_REPO=$open_repo"
108+
echo "OPEN_REF=$open_ref"
109+
echo "OPEN_PR=$open_pr"
110+
echo "HAS_INVALID=$has_invalid"
111+
} >> "$GITHUB_ENV"
112+
113+
echo "should_run=true" >> "$GITHUB_OUTPUT"
57114
58-
state="$(printf "%s" "$pr_json" | jq -r '.state // empty')"
59-
merged_at="$(printf "%s" "$pr_json" | jq -r '.merged_at // empty')"
60-
head_repo="$(printf "%s" "$pr_json" | jq -r '.head.repo.full_name // empty')"
61-
head_ref="$(printf "%s" "$pr_json" | jq -r '.head.ref // empty')"
115+
- name: Resolve wolfSSL ref from patch defines
116+
id: resolve
117+
if: steps.find_defines.outputs.should_run == 'true' && steps.eval_prs.outputs.should_run == 'true'
118+
run: |
119+
set -euo pipefail
62120
63-
if [ -n "$merged_at" ]; then
64-
echo "PR #$pr_number is merged; using wolfSSL master branch."
121+
if [ "${MERGED_ALL}" = "true" ]; then
122+
echo "All PRs are merged; using wolfSSL master branch."
65123
echo "should_run=true" >> "$GITHUB_OUTPUT"
66124
echo "wolfssl_repo=wolfSSL/wolfssl" >> "$GITHUB_OUTPUT"
67125
echo "wolfssl_ref=master" >> "$GITHUB_OUTPUT"
68-
echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
126+
echo "pr_number=all" >> "$GITHUB_OUTPUT"
127+
exit 0
128+
fi
129+
130+
if [ "${HAS_INVALID}" = "true" ]; then
131+
echo "::warning::One or more PRs are not merged or open; skipping patched CI."
132+
echo "should_run=false" >> "$GITHUB_OUTPUT"
69133
exit 0
70134
fi
71135
72-
if [ "$state" = "open" ] && [ -n "$head_repo" ] && [ -n "$head_ref" ]; then
136+
if [ "${OPEN_COUNT}" -eq 1 ]; then
73137
echo "should_run=true" >> "$GITHUB_OUTPUT"
74-
echo "wolfssl_repo=$head_repo" >> "$GITHUB_OUTPUT"
75-
echo "wolfssl_ref=$head_ref" >> "$GITHUB_OUTPUT"
76-
echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
77-
echo "PR #$pr_number is open; using branch $head_ref from repo $head_repo."
138+
echo "wolfssl_repo=${OPEN_REPO}" >> "$GITHUB_OUTPUT"
139+
echo "wolfssl_ref=${OPEN_REF}" >> "$GITHUB_OUTPUT"
140+
echo "pr_number=${OPEN_PR}" >> "$GITHUB_OUTPUT"
141+
echo "Exactly one PR is open (#${OPEN_PR}); using branch ${OPEN_REF} from repo ${OPEN_REPO}."
78142
exit 0
79143
fi
80144
81-
echo "::warning::PR #$pr_number is not merged or has no accessible branch; skipping patched CI."
145+
echo "::warning::Multiple open PRs found; skipping patched CI."
82146
echo "should_run=false" >> "$GITHUB_OUTPUT"
83147
84148
patched_jni_build:
@@ -126,10 +190,9 @@ jobs:
126190
run: |
127191
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/build-dir/lib" >> "$GITHUB_ENV"
128192
129-
- name: Build and test JNI library with all patches
193+
- name: Build and test JNI library with all patches enabled
130194
run: |
131-
make all-patched PREFIX=$GITHUB_WORKSPACE/build-dir
132-
make check
195+
make build check PREFIX=$GITHUB_WORKSPACE/build-dir ENABLE_PATCHES=1
133196
134197
- name: Show logs on failure
135198
if: failure() || cancelled()

‎Makefile‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@ endif
2121
all: build
2222

2323
build: java.sh build.xml
24-
./java.sh $(INSTALL_DIR)
24+
@cflags=""; \
25+
if [ "$(ENABLE_PATCHES)" = "1" ]; then \
26+
defines="$$(./scripts/find-wolfssl-pr-patch-defines.sh)"; \
27+
if [ -z "$$defines" ]; then \
28+
echo "warning: no WOLFSSL_PR*_PATCH_APPLIED defines found; building without patches"; \
29+
else \
30+
for define in $$defines; do \
31+
cflags="$$cflags -D$$define"; \
32+
done; \
33+
fi; \
34+
fi; \
35+
CFLAGS="$$cflags" ./java.sh $(INSTALL_DIR); \
2536
ant
2637

2738
check: build
@@ -30,21 +41,6 @@ check: build
3041
clean:
3142
ant clean cleanjni
3243

33-
# Enable all WOLFSSL_PR*_PATCH_APPLIED defines when building JNI.
34-
# Requires latest/recent wolfssl source with patches applied. This is not
35-
# detected automatically.
36-
all-patched:
37-
@defines="$$(./scripts/find-wolfssl-pr-patch-defines.sh)"; \
38-
if [ -z "$$defines" ]; then \
39-
echo "warning: no WOLFSSL_PR*_PATCH_APPLIED defines found; skipping all-patched"; \
40-
exit 0; \
41-
fi; \
42-
cflags=""; \
43-
for define in $$defines; do \
44-
cflags="$$cflags -D$$define"; \
45-
done; \
46-
CFLAGS="$$cflags" ./java.sh $(INSTALL_DIR); \
47-
ant
4844

4945
install:
5046
$(INSTALL) -d $(INSTALL_DIR)/$(LIBDIR)

‎scripts/find-pr-fork-branch.sh‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#!/usr/bin/env bash
2+
3+
# Given a PR number, print the originating fork (repo full_name) and branch.
4+
# Default repo is wolfSSL/wolfssl. Override with --repo owner/name.
5+
6+
set -euo pipefail
7+
8+
usage() {
9+
cat <<'EOF'
10+
Usage: scripts/find-pr-fork-branch.sh <pr_number> [--repo owner/name]
11+
12+
Outputs:
13+
<fork_full_name>/<branch_name> (<open|closed|merged|unknown>)
14+
15+
Example:
16+
scripts/find-pr-fork-branch.sh 9631
17+
scripts/find-pr-fork-branch.sh 9631 --repo wolfSSL/wolfssl
18+
EOF
19+
}
20+
21+
if [ "${1:-}" = "-h" ] || [ "${1:-}" = "--help" ]; then
22+
usage
23+
exit 0
24+
fi
25+
26+
if [ -z "${1:-}" ]; then
27+
usage
28+
exit 2
29+
fi
30+
31+
pr_number="$1"
32+
shift
33+
34+
repo="wolfSSL/wolfssl"
35+
if [ "${1:-}" = "--repo" ]; then
36+
if [ -z "${2:-}" ]; then
37+
echo "error: --repo requires owner/name" >&2
38+
exit 2
39+
fi
40+
repo="$2"
41+
shift 2
42+
fi
43+
44+
if [ -n "${1:-}" ]; then
45+
echo "error: unexpected argument: $1" >&2
46+
exit 2
47+
fi
48+
49+
if ! command -v jq >/dev/null 2>&1; then
50+
echo "error: jq is required but not installed" >&2
51+
exit 127
52+
fi
53+
54+
pr_json="$(curl -fsSL "https://api.github.com/repos/${repo}/pulls/${pr_number}" || true)"
55+
if [ -z "$pr_json" ]; then
56+
echo "error: failed to fetch PR #${pr_number} from ${repo}" >&2
57+
exit 1
58+
fi
59+
60+
head_repo="$(printf "%s" "$pr_json" | jq -r '.head.repo.full_name // empty')"
61+
head_ref="$(printf "%s" "$pr_json" | jq -r '.head.ref // empty')"
62+
state="$(printf "%s" "$pr_json" | jq -r '.state // empty')"
63+
merged_at="$(printf "%s" "$pr_json" | jq -r '.merged_at // empty')"
64+
65+
if [ -z "$head_repo" ] || [ -z "$head_ref" ]; then
66+
echo "error: PR #${pr_number} missing head repo/ref data" >&2
67+
exit 1
68+
fi
69+
70+
status="$state"
71+
if [ -n "$merged_at" ]; then
72+
status="merged"
73+
fi
74+
75+
if [ -z "$status" ]; then
76+
status="unknown"
77+
fi
78+
79+
echo "${head_repo}/${head_ref} (${status})"

0 commit comments

Comments
 (0)