Skip to content

Commit e820f81

Browse files
committed
Removed redundat hotfix from the ATECC608 workflow
1 parent 241b502 commit e820f81

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/atecc608-sim.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ concurrency:
1919
#
2020
# The simulator's own Dockerfile.wolfcrypt clones a pinned wolfSSL release.
2121
# We patch it to COPY the PR checkout instead so CI reflects the PR's source.
22-
# We also strip the inline test.c patch RUN block: those guard fixes now live
23-
# upstream in this tree, so re-applying them would fail with "patch target not
24-
# found". The remaining sed-based patches in the Dockerfile (atmel.c XMEMSET
25-
# swap and atmel_set_slot_allocator visibility) are no-ops on pre-patched
26-
# source and their grep validations still pass, so we leave them alone.
22+
# We also strip the inline test.c patch RUN block and the older atmel.c config
23+
# copy hotfix: both now live upstream in this tree, so re-applying them would
24+
# fail with "patch target not found". The atmel_set_slot_allocator visibility
25+
# patch remains because the simulator harness still depends on that exported
26+
# symbol.
2727

2828
env:
2929
SIMULATORS_REF: 773fe70
@@ -48,7 +48,7 @@ jobs:
4848
- name: Stage PR wolfSSL into simulator build context
4949
run: mv wolfssl-src simulators/ATECC608Sim/wolfssl
5050

51-
- name: Patch Dockerfile to use PR wolfSSL and drop redundant test.c patches
51+
- name: Patch Dockerfile to use PR wolfSSL and drop redundant source patches
5252
working-directory: simulators/ATECC608Sim
5353
run: |
5454
# Replace the (multi-line) `RUN git clone ... wolfssl.git /app/wolfssl`
@@ -60,6 +60,9 @@ jobs:
6060
grep -q '^ *COPY wolfssl /app/wolfssl$' Dockerfile.wolfcrypt
6161
! grep -q 'git clone .*wolfssl\.git' Dockerfile.wolfcrypt
6262
63+
sed -i "/^# wolfSSL's wolfCrypt_ATECC_SetConfig only copies I2C-specific fields from$/,/^ grep -q 'XMEMCPY(&cfg_ateccx08a_i2c_pi, cfg' \\/app\\/wolfssl\\/wolfcrypt\\/src\\/port\\/atmel\\/atmel\\.c$/d" Dockerfile.wolfcrypt
64+
! grep -q "cfg_ateccx08a_i2c_pi" Dockerfile.wolfcrypt
65+
6366
# Strip the inline test.c patch RUN block -- those guard fixes now
6467
# live upstream in this tree.
6568
sed -i "/^RUN python3 - <<'PY'$/,/^PY$/d" Dockerfile.wolfcrypt

0 commit comments

Comments
 (0)