Skip to content

Commit d2ba113

Browse files
authored
Merge branch 'main' into shutting-down-exception
2 parents b45619c + fa76e99 commit d2ba113

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/actions_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
on: [ ubicloud-standard-8, macos-12, windows-latest ]
35+
on: [ ubicloud-standard-8, macos-latest, windows-latest ]
3636
java: [ 21 ]
3737
include:
3838
- java: 8

core/src/main/resources/com/linecorp/armeria/public_suffixes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
!city.yokohama.jp
88
!www.ck
99
*.001.test.code-builder-stg.platform.salesforce.com
10+
*.0e.vc
1011
*.0emm.com
1112
*.advisor.ws
1213
*.af-south-1.airflow.amazonaws.com
@@ -169,7 +170,6 @@
169170
0.bg
170171
001www.com
171172
0am.jp
172-
0e.vc
173173
0g0.jp
174174
0j0.jp
175175
0t0.jp

0 commit comments

Comments
 (0)