Skip to content

Commit 9cf3514

Browse files
padelsbachpadelsbach
committed
Improvements to patch testing
1 parent 96f1fdb commit 9cf3514

4 files changed

Lines changed: 188 additions & 69 deletions

File tree

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

Lines changed: 90 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,71 +15,109 @@ jobs:
1515
resolve_wolfssl_ref:
1616
runs-on: ubuntu-latest
1717
outputs:
18-
should_run: ${{ steps.resolve.outputs.should_run }}
19-
wolfssl_repo: ${{ steps.resolve.outputs.wolfssl_repo }}
20-
wolfssl_ref: ${{ steps.resolve.outputs.wolfssl_ref }}
21-
pr_number: ${{ steps.resolve.outputs.pr_number }}
18+
should_run: ${{ steps.eval_prs.outputs.should_run }}
19+
wolfssl_repo: ${{ steps.eval_prs.outputs.wolfssl_repo }}
20+
wolfssl_ref: ${{ steps.eval_prs.outputs.wolfssl_ref }}
2221
steps:
2322
- uses: actions/checkout@v4
2423

25-
- name: Resolve wolfSSL ref from patch defines
26-
id: resolve
24+
- name: Install prerequisites
2725
run: |
28-
set -euo pipefail
26+
sudo apt-get update
27+
sudo apt-get install -y jq curl
2928
30-
# Find WOLFSSL_PR*_PATCH_APPLIED defines in wolfssl source.
31-
defines="$(./scripts/find-wolfssl-pr-patch-defines.sh)"
29+
- name: Find patch defines
30+
id: find_defines
31+
run: |
32+
set -euo pipefail
33+
defines=""
34+
if ! defines="$(./scripts/find-wolfssl-pr-patch-defines.sh)"; then
35+
echo "::warning::find-wolfssl-pr-patch-defines.sh failed; skipping patched CI."
36+
echo "should_run=false" >> "$GITHUB_OUTPUT"
37+
exit 0
38+
fi
3239
if [ -z "$defines" ]; then
3340
echo "::warning::No WOLFSSL_PR*_PATCH_APPLIED defines found; skipping patched CI."
3441
echo "should_run=false" >> "$GITHUB_OUTPUT"
3542
exit 0
3643
fi
3744
echo "Found patch defines:"
3845
printf "%s\n" "$defines"
46+
{
47+
echo "should_run=true"
48+
echo "defines<<EOF"
49+
printf "%s\n" "$defines"
50+
echo "EOF"
51+
} >> "$GITHUB_OUTPUT"
52+
53+
- name: Evaluate PR statuses
54+
id: eval_prs
55+
if: steps.find_defines.outputs.should_run == 'true'
56+
run: |
57+
set -euo pipefail
3958
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"
48-
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."
57-
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')"
62-
63-
if [ -n "$merged_at" ]; then
64-
echo "PR #$pr_number is merged; using wolfSSL master branch."
65-
echo "should_run=true" >> "$GITHUB_OUTPUT"
66-
echo "wolfssl_repo=wolfSSL/wolfssl" >> "$GITHUB_OUTPUT"
67-
echo "wolfssl_ref=master" >> "$GITHUB_OUTPUT"
68-
echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
69-
exit 0
70-
fi
59+
defines="${{ steps.find_defines.outputs.defines }}"
60+
should_run=true
61+
wolfssl_repo="wolfSSL/wolfssl"
62+
wolfssl_ref="master"
63+
found_open=false
7164
72-
if [ "$state" = "open" ] && [ -n "$head_repo" ] && [ -n "$head_ref" ]; then
73-
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."
78-
exit 0
79-
fi
65+
echo "Evaluating patch defines:"
66+
printf "%s\n" "$defines"
8067
81-
echo "::warning::PR #$pr_number is not merged or has no accessible branch; skipping patched CI."
82-
echo "should_run=false" >> "$GITHUB_OUTPUT"
68+
while read -r define; do
69+
define="$(printf "%s" "$define" | tr -d '\r' | xargs)"
70+
[ -z "$define" ] && continue
71+
pr_number="$(printf "%s" "$define" | sed -E 's/^WOLFSSL_PR([0-9]+)_PATCH_APPLIED$/\1/')"
72+
if [ -z "$pr_number" ] || [ "$pr_number" = "$define" ]; then
73+
echo "::warning::Failed to derive PR number from define $define; skipping patched CI."
74+
echo "should_run=false" >> "$GITHUB_OUTPUT"
75+
exit 0
76+
fi
77+
78+
fork_ref_status=""
79+
if ! fork_ref_status="$(./scripts/find-pr-fork-branch.sh "$pr_number" --repo wolfSSL/wolfssl)"; then
80+
echo "::warning::find-pr-fork-branch.sh failed for PR #$pr_number; skipping patched CI."
81+
echo "should_run=false" >> "$GITHUB_OUTPUT"
82+
exit 0
83+
fi
84+
if [ -z "$fork_ref_status" ]; then
85+
echo "::warning::Unable to resolve PR #$pr_number fork/branch; skipping patched CI."
86+
echo "should_run=false" >> "$GITHUB_OUTPUT"
87+
exit 0
88+
fi
89+
echo "PR #$pr_number raw status: [$fork_ref_status]"
90+
91+
case "$fork_ref_status" in
92+
*" (merged)")
93+
continue
94+
;;
95+
*" (open)")
96+
if [ "$found_open" = "false" ]; then
97+
full_ref="${fork_ref_status%% *}"
98+
wolfssl_repo="${full_ref%/*}"
99+
wolfssl_ref="${full_ref##*/}"
100+
found_open=true
101+
echo "PR #$pr_number is open; using fork ref $wolfssl_repo/$wolfssl_ref for wolfSSL source"
102+
else
103+
echo "::warning::Found multiple PRs with patch defines; unable to determine which one to use; skipping patched CI."
104+
should_run=false
105+
break
106+
fi
107+
;;
108+
*)
109+
echo "::warning::PR #$pr_number is in unexpected state: $fork_ref_status; skipping patched CI."
110+
should_run=false
111+
break
112+
;;
113+
esac
114+
done <<EOF
115+
$defines
116+
EOF
117+
118+
echo "should_run=$should_run" >> "$GITHUB_OUTPUT"
119+
echo "wolfssl_repo=$wolfssl_repo" >> "$GITHUB_OUTPUT"
120+
echo "wolfssl_ref=$wolfssl_ref" >> "$GITHUB_OUTPUT"
83121
84122
patched_jni_build:
85123
needs: resolve_wolfssl_ref
@@ -126,10 +164,9 @@ jobs:
126164
run: |
127165
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/build-dir/lib" >> "$GITHUB_ENV"
128166
129-
- name: Build and test JNI library with all patches
167+
- name: Build and test JNI library with all patches enabled
130168
run: |
131-
make all-patched PREFIX=$GITHUB_WORKSPACE/build-dir
132-
make check
169+
make build check PREFIX=$GITHUB_WORKSPACE/build-dir ENABLE_PATCHES=1
133170
134171
- name: Show logs on failure
135172
if: failure() || cancelled()

‎IDE/Android/app/src/main/cpp/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,14 @@ aux_source_directory(${wolfssl_DIR}/src TLS_SOURCES)
252252
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/bio.c)
253253
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/conf.c)
254254
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/pk.c)
255+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/pk_ec.c)
256+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/pk_rsa.c)
255257
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_bn.c)
258+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_api_cert.c)
259+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_api_crl_ocsp.c)
260+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_api_pk.c)
256261
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_asn1.c)
262+
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_ech.c)
257263
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_certman.c)
258264
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_crypto.c)
259265
list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_load.c)
@@ -268,6 +274,7 @@ if ("${WOLFSSL_PKG_TYPE}" MATCHES "normal")
268274
# Add crypto sources to CRYPTO_SOURCES, remove files that are included inline by other files
269275
aux_source_directory(${wolfssl_DIR}/wolfcrypt/src CRYPTO_SOURCES)
270276
list(REMOVE_ITEM CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/evp.c)
277+
list(REMOVE_ITEM CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/evp_pk.c)
271278
list(REMOVE_ITEM CRYPTO_SOURCES ${wolfssl_DIR}/wolfcrypt/src/misc.c)
272279

273280
elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")

‎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)