Skip to content

Commit 047b528

Browse files
JimmyDaddyJimmyDaddy
authored
CD: release v1.2.7 (#255)
* chore: fix release-it preset to conventionalcommits * chore: build(release): upgrade release-it config * chore: build(release): add conventional-changelog-conventionalcommits * chore: release 1.2.7 * chore: update ci * chore: update ci * chore: update ci ruby and cocoapods version * chore: update ci
1 parent 2e961a4 commit 047b528

File tree

3 files changed

+102
-50
lines changed

3 files changed

+102
-50
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 70 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,35 @@ concurrency:
1010

1111
jobs:
1212

13+
security:
14+
runs-on: ubuntu-latest
15+
name: Security & Dependency Review
16+
steps:
17+
- name: Checkout the code
18+
uses: actions/checkout@v4
19+
20+
- name: Dependency Review
21+
uses: actions/dependency-review-action@v4
22+
if: github.event_name == 'pull_request'
23+
with:
24+
fail-on-severity: moderate
25+
26+
- name: Setup node
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: '20'
30+
31+
- name: Install dependencies
32+
run: npm install
33+
34+
- name: Run npm audit
35+
run: npm audit --audit-level=moderate
36+
continue-on-error: true
37+
1338
install-dep:
1439
runs-on: macos-latest
40+
env:
41+
NO_FLIPPER: '1'
1542
name: Install dependencies
1643
steps:
1744
- name: Checkout the code
@@ -26,7 +53,7 @@ jobs:
2653
!*.MD
2754
!*.yml
2855
29-
- uses: actions/cache@v3
56+
- uses: actions/cache@v4
3057
name: Cache node_modules
3158
id: cache-node-modules
3259
if: steps.verify-dev-changed-files.outputs.any_changed == 'true'
@@ -35,19 +62,21 @@ jobs:
3562
node_modules
3663
example/node_modules
3764
key: ${{ runner.os }}-nodeModules-${{ hashFiles('package.json') }}-${{ hashFiles('example/package.json') }}
65+
restore-keys: |
66+
${{ runner.os }}-nodeModules-
3867
3968
- name: Set up Ruby
4069
if: steps.verify-dev-changed-files.outputs.any_changed == 'true'
4170
uses: ruby/setup-ruby@v1
4271
with:
43-
ruby-version: 2.7
72+
ruby-version: '3.2'
4473
bundler-cache: true
4574

4675
- name: Setup node
4776
if: steps.verify-dev-changed-files.outputs.any_changed == 'true'
48-
uses: actions/setup-node@v3
77+
uses: actions/setup-node@v4
4978
with:
50-
node-version: '18'
79+
node-version: '20'
5180

5281
- name: Install npm dependencies
5382
if: steps.cache-node-modules.outputs.cache-hit != 'true' && steps.verify-dev-changed-files.outputs.any_changed == 'true'
@@ -80,18 +109,19 @@ jobs:
80109
!example/ios/**
81110
example/e2e/**
82111
83-
- uses: actions/cache@v3
112+
- uses: actions/cache@v4
84113
name: Cache node_modules
85114
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
86115
id: cache-node-modules
87116
with:
88117
path: |
89118
node_modules
90119
example/node_modules
91-
fail-on-cache-miss: true
92120
key: ${{ runner.os }}-nodeModules-${{ hashFiles('package.json') }}-${{ hashFiles('example/package.json') }}
121+
restore-keys: |
122+
${{ runner.os }}-nodeModules-
93123
94-
- uses: actions/cache@v3
124+
- uses: actions/cache@v4
95125
id: cache-gradle
96126
name: Cache Gradle dependencies
97127
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
@@ -100,22 +130,17 @@ jobs:
100130
~/.gradle/caches
101131
~/.gradle/wrapper
102132
key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('android/src/**/*.kt') }}
103-
104-
- name: Set up Ruby
105-
uses: ruby/setup-ruby@v1
106-
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
107-
with:
108-
ruby-version: 2.7
109-
bundler-cache: true
133+
restore-keys: |
134+
${{ runner.os }}-gradle-
110135
111136
- name: Setup node
112-
uses: actions/setup-node@v3
137+
uses: actions/setup-node@v4
113138
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
114139
with:
115-
node-version: '18'
140+
node-version: '20'
116141

117142
- name: Set up JDK
118-
uses: actions/setup-java@v3
143+
uses: actions/setup-java@v4
119144
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
120145
with:
121146
distribution: 'zulu'
@@ -149,7 +174,7 @@ jobs:
149174
path: ${{ github.workspace }}/example/android/app-release-${{ github.sha }}.apk
150175

151176
android-api-level-test:
152-
runs-on: macos-latest
177+
runs-on: macos-13
153178
needs: android-build
154179
name: Android Test
155180
strategy:
@@ -172,43 +197,38 @@ jobs:
172197
!example/ios/**
173198
example/e2e/**
174199
175-
- uses: actions/cache@v3
200+
- uses: actions/cache@v4
176201
name: Cache node_modules
177202
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
178203
id: cache-node-modules
179204
with:
180205
path: |
181206
node_modules
182207
example/node_modules
183-
fail-on-cache-miss: true
184208
key: ${{ runner.os }}-nodeModules-${{ hashFiles('package.json') }}-${{ hashFiles('example/package.json') }}
209+
restore-keys: |
210+
${{ runner.os }}-nodeModules-
185211
186-
- uses: actions/cache@v3
212+
- uses: actions/cache@v4
187213
name: Cache Gradle dependencies
188214
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
189215
id: cache-gradle
190216
with:
191217
path: |
192218
~/.gradle/caches
193219
~/.gradle/wrapper
194-
fail-on-cache-miss: true
195220
key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('android/src/**/*.kt') }}
196-
197-
- name: Set up Ruby
198-
uses: ruby/setup-ruby@v1
199-
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
200-
with:
201-
ruby-version: 2.7
202-
bundler-cache: true
221+
restore-keys: |
222+
${{ runner.os }}-gradle-
203223
204224
- name: Setup node
205-
uses: actions/setup-node@v3
225+
uses: actions/setup-node@v4
206226
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
207227
with:
208-
node-version: '18'
228+
node-version: '20'
209229

210230
- name: Set up JDK
211-
uses: actions/setup-java@v3
231+
uses: actions/setup-java@v4
212232
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
213233
with:
214234
distribution: 'zulu'
@@ -220,7 +240,7 @@ jobs:
220240
with:
221241
api-level: ${{ matrix.api-level }}
222242
target: ${{ matrix.target }}
223-
arch: arm64-v8a
243+
arch: x86_64
224244
profile: pixel_5
225245
script: |
226246
cd example/android && ./gradlew connectedCheck --stacktrace
@@ -234,11 +254,13 @@ jobs:
234254

235255
ios-build-test:
236256
runs-on: macos-latest
257+
env:
258+
NO_FLIPPER: '1'
237259
needs: install-dep
238260
name: iOS Build and Test
239261
strategy:
240262
matrix:
241-
cocoapods: ['1.10.1', '1.14.3']
263+
cocoapods: ['1.14.3', '1.15.0']
242264
steps:
243265
- name: Checkout the code
244266
uses: actions/checkout@v4
@@ -255,7 +277,7 @@ jobs:
255277
!example/android/**
256278
example/e2e/**
257279
258-
- uses: actions/cache@v3
280+
- uses: actions/cache@v4
259281
name: Cache node_modules
260282
id: cache-node-modules
261283
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
@@ -264,21 +286,25 @@ jobs:
264286
node_modules
265287
example/node_modules
266288
key: ${{ runner.os }}-nodeModules-${{ hashFiles('package.json') }}-${{ hashFiles('example/package.json') }}
267-
fail-on-cache-miss: true
289+
restore-keys: |
290+
${{ runner.os }}-nodeModules-
268291
269292
- name: Cache Pods
270293
id: cache-pods
271-
uses: actions/cache@v3
294+
uses: actions/cache@v4
272295
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
273296
with:
274297
path: example/ios/Pods
275298
key: ${{ runner.os }}-pods-${{ matrix.cocoapods }}-${{ hashFiles('**/Podfile.lock') }}
299+
restore-keys: |
300+
${{ runner.os }}-pods-${{ matrix.cocoapods }}-
301+
${{ runner.os }}-pods-
276302
277303
- name: Set up Ruby
278304
uses: ruby/setup-ruby@v1
279305
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
280306
with:
281-
ruby-version: 2.7
307+
ruby-version: '3.2'
282308
bundler-cache: true
283309

284310
- name: Install Cocoapods
@@ -287,9 +313,9 @@ jobs:
287313

288314
- name: Setup node
289315
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
290-
uses: actions/setup-node@v3
316+
uses: actions/setup-node@v4
291317
with:
292-
node-version: '18'
318+
node-version: '20'
293319

294320
- name: Install Pods
295321
if: steps.cache-pods.outputs.cache-hit != 'true' && steps.verify-iOS-changed-files.outputs.any_changed == 'true'
@@ -306,21 +332,21 @@ jobs:
306332
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
307333
run: |
308334
cd example/ios
309-
xcodebuild -workspace ImageMarkerExample.xcworkspace -scheme ImageMarkerExample -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12' | xcpretty
335+
xcodebuild -workspace ImageMarkerExample.xcworkspace -scheme ImageMarkerExample -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16' | xcpretty
310336
311337
- name: Test
312338
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
313339
run: |
314340
cd example/ios
315-
xcodebuild -workspace ImageMarkerExample.xcworkspace -scheme ImageMarkerExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12' test | xcpretty
341+
xcodebuild -workspace ImageMarkerExample.xcworkspace -scheme ImageMarkerExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16' test | xcpretty
316342
317343
ci-complete:
318344
name: Complete CI
319-
needs: [android-build, android-api-level-test, ios-build-test]
345+
needs: [security, android-build, android-api-level-test, ios-build-test]
320346
if: ${{ always() }}
321347
runs-on: ubuntu-latest
322348
steps:
323349
- name: Check all job status
324350
if: >-
325-
${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}
351+
${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
326352
run: exit 1

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1+
# Changelog
12

3+
## [1.2.7](///compare/v1.1.8...v1.2.7) (2025-11-20)
4+
5+
### Features
6+
7+
* expo support ([#207](undefined/undefined/undefined/issues/207)) 7a6ca14
8+
9+
### Bug Fixes
10+
11+
* fix [#158](undefined/undefined/undefined/issues/158) android release bug style not working ([#160](undefined/undefined/undefined/issues/160)) a942e30
12+
* fontName bug (android) ([#196](undefined/undefined/undefined/issues/196)) 83d9856
13+
* add custom fonts to example ([#197](undefined/undefined/undefined/issues/197)) 6e2ad75
14+
* coil load image with original size ([#217](undefined/undefined/undefined/issues/217)) d6e8744
15+
* fix [#164](undefined/undefined/undefined/issues/164) Build Failure on CI Due to CocoaPods 1.1.9 in iOS Project ([#165](undefined/undefined/undefined/issues/165)) 532e8a4
16+
* fix [#179](undefined/undefined/undefined/issues/179) Same watermark image is behaving differently on ANDROID and iOS ([#180](undefined/undefined/undefined/issues/180)) 10d71e1
17+
* fix [#179](undefined/undefined/undefined/issues/179) same watermark image is behaving differently on android and ios when use given position enum ([#187](undefined/undefined/undefined/issues/187)) 1c62250
18+
* fix [#202](undefined/undefined/undefined/issues/202) generates inconsistent text size across different devices ([#204](undefined/undefined/undefined/issues/204)) 47c0cd9
19+
* fix[#176](undefined/undefined/undefined/issues/176) Fresco 3.1.3 compatibility issues with RN 0.73.0, compileDebugKotlin FAILED ([#177](undefined/undefined/undefined/issues/177)) 06d65c4
20+
* Handle Nullable Map and Enum Mismatch in MarkTextOptions.kt ([#247](undefined/undefined/undefined/issues/247)) 9878efa
21+
* load base64 image on android ([#240](undefined/undefined/undefined/issues/240)) 4764a6f
22+
* parse hex color string crash on iOS ([#186](undefined/undefined/undefined/issues/186)) 53ac1f1
23+
* RN 0.80.2 build error ([#248](undefined/undefined/undefined/issues/248)) 76d6972
224

325
## [1.2.6](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.2.6) (2024-02-04)
426

‎package.json‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-image-marker",
3-
"version": "1.2.6",
3+
"version": "1.2.7",
44
"description": "Add text or icon watermark to your images",
55
"main": "lib/commonjs/index",
66
"module": "lib/module/index",
@@ -66,11 +66,12 @@
6666
"@evilmartians/lefthook": "^1.2.2",
6767
"@expo/config-plugins": "^7.8.4",
6868
"@react-native-community/eslint-config": "^3.0.2",
69-
"@release-it/conventional-changelog": "^7.0.2",
69+
"@release-it/conventional-changelog": "^10.0.2",
7070
"@types/jest": "^28.1.2",
7171
"@types/react": "~17.0.21",
7272
"@types/react-native": "0.70.0",
7373
"commitlint": "^17.0.2",
74+
"conventional-changelog-conventionalcommits": "^9.1.0",
7475
"del-cli": "^5.0.0",
7576
"eslint": "^8.4.1",
7677
"eslint-config-prettier": "^8.5.0",
@@ -83,7 +84,7 @@
8384
"react": "18.2.0",
8485
"react-native": "0.73.3",
8586
"react-native-builder-bob": "^0.20.0",
86-
"release-it": "^16.2.0",
87+
"release-it": "^19.0.6",
8788
"typedoc": "^0.24.8",
8889
"typedoc-plugin-localization": "^3.0.1",
8990
"typedoc-plugin-rename-defaults": "^0.6.5",
@@ -114,7 +115,8 @@
114115
"release-it": {
115116
"git": {
116117
"commitMessage": "chore: release ${version}",
117-
"tagName": "v${version}"
118+
"tagName": "v${version}",
119+
"changelog": "grep '^## ' CHANGELOG.md | head -n 1"
118120
},
119121
"npm": {
120122
"publish": false
@@ -124,8 +126,10 @@
124126
},
125127
"plugins": {
126128
"@release-it/conventional-changelog": {
127-
"preset": "angular",
128-
"infile": "CHANGELOG.md"
129+
"preset": "conventionalcommits",
130+
"infile": "CHANGELOG.md",
131+
"header": "# Changelog",
132+
"releaseCount": 0
129133
}
130134
}
131135
},

0 commit comments

Comments
 (0)