File tree 2 files changed +12
-4
lines changed
2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -54,10 +54,14 @@ jobs:
54
54
uses : actions/checkout@v3
55
55
with :
56
56
path : ${{ env.IMGTOOL_PACKING_PATH }}
57
+
58
+ - name : Set the version
59
+ working-directory : ${{ env.IMGTOOL_PACKING_PATH }}/patches/
60
+ run : perl -pi -e "s/ARDUINO_VERSION_PLACEHOLDER/${GITHUB_REF/refs\/tags\//}/g" 0008-Imgtool-Append-arduino-to-version-string.patch
57
61
58
62
- name : Apply patches
59
63
working-directory : ${{ env.MCUBOOT_PATH }}/scripts/
60
- run : git apply -v "${{ env.IMGTOOL_PACKING_PATH }}/patches/"*
64
+ run : git apply -v "${{ env.IMGTOOL_PACKING_PATH }}/patches/"*.patch
61
65
62
66
- name : Set up Python ${{ env.PYTHON_VERSION }}
63
67
uses : actions/setup-python@v3
@@ -139,9 +143,13 @@ jobs:
139
143
with :
140
144
path : ${{ env.IMGTOOL_PACKING_PATH }}
141
145
146
+ - name : Set the version
147
+ working-directory : ${{ env.IMGTOOL_PACKING_PATH }}/patches/
148
+ run : perl -pi -e "s/ARDUINO_VERSION_PLACEHOLDER/${GITHUB_REF/refs\/tags\//}/g" 0008-Imgtool-Append-arduino-to-version-string.patch
149
+
142
150
- name : Apply patches
143
151
working-directory : ${{ env.MCUBOOT_PATH }}/scripts/
144
- run : git apply -v "${{ env.IMGTOOL_PACKING_PATH }}/patches/"*
152
+ run : git apply -v "${{ env.IMGTOOL_PACKING_PATH }}/patches/"*.patch
145
153
146
154
- name : Set up QEMU
147
155
uses : docker/setup-qemu-action@v2
Original file line number Diff line number Diff line change 1
1
From bc65a76a48fe688bf9e9ce3efe90973976cf400a Mon Sep 17 00:00:00 2001
2
2
3
3
Date: Mon, 18 Oct 2021 09:41:39 +0200
4
- Subject: [PATCH] Imgtool: Append -arduino to version string
4
+ Subject: [PATCH] Imgtool: Add version placeholder, can be customized during build
5
5
6
6
---
7
7
scripts/imgtool/__init__.py | 2 +-
@@ -16,7 +16,7 @@ index ca43b8d..20769a4 100644
16
16
# limitations under the License.
17
17
18
18
- imgtool_version = "1.8.0"
19
- + imgtool_version = "1.8.0-arduino "
19
+ + imgtool_version = "ARDUINO_VERSION_PLACEHOLDER "
20
20
- -
21
21
2.30.2
22
22
You can’t perform that action at this time.
0 commit comments