Skip to content

Commit f7d9d53

Browse files
NeilpangNeilpang
authored
Merge pull request #4899 from acmesh-official/dev
sync
2 parents 377a37e + f4315e2 commit f7d9d53

26 files changed

+554
-265
lines changed

‎.github/workflows/DNS.yml‎

Lines changed: 69 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
TokenName4: ${{ secrets.TokenName4}}
6666
TokenName5: ${{ secrets.TokenName5}}
6767
steps:
68-
- uses: actions/checkout@v3
68+
- uses: actions/checkout@v4
6969
- name: Clone acmetest
7070
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
7171
- name: Set env file
@@ -113,7 +113,7 @@ jobs:
113113
TokenName4: ${{ secrets.TokenName4}}
114114
TokenName5: ${{ secrets.TokenName5}}
115115
steps:
116-
- uses: actions/checkout@v3
116+
- uses: actions/checkout@v4
117117
- name: Install tools
118118
run: brew install socat
119119
- name: Clone acmetest
@@ -164,7 +164,7 @@ jobs:
164164
- name: Set git to use LF
165165
run: |
166166
git config --global core.autocrlf false
167-
- uses: actions/checkout@v3
167+
- uses: actions/checkout@v4
168168
- name: Install cygwin base packages with chocolatey
169169
run: |
170170
choco config get cacheLocation
@@ -204,7 +204,7 @@ jobs:
204204
205205
206206
FreeBSD:
207-
runs-on: macos-12
207+
runs-on: ubuntu-latest
208208
needs: Windows
209209
env:
210210
TEST_DNS : ${{ secrets.TEST_DNS }}
@@ -223,10 +223,10 @@ jobs:
223223
TokenName4: ${{ secrets.TokenName4}}
224224
TokenName5: ${{ secrets.TokenName5}}
225225
steps:
226-
- uses: actions/checkout@v3
226+
- uses: actions/checkout@v4
227227
- name: Clone acmetest
228228
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
229-
- uses: vmactions/freebsd-vm@v0
229+
- uses: vmactions/freebsd-vm@v1
230230
with:
231231
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
232232
prepare: pkg install -y socat curl
@@ -255,7 +255,7 @@ jobs:
255255
256256
257257
OpenBSD:
258-
runs-on: macos-12
258+
runs-on: ubuntu-latest
259259
needs: FreeBSD
260260
env:
261261
TEST_DNS : ${{ secrets.TEST_DNS }}
@@ -274,10 +274,10 @@ jobs:
274274
TokenName4: ${{ secrets.TokenName4}}
275275
TokenName5: ${{ secrets.TokenName5}}
276276
steps:
277-
- uses: actions/checkout@v3
277+
- uses: actions/checkout@v4
278278
- name: Clone acmetest
279279
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
280-
- uses: vmactions/openbsd-vm@v0
280+
- uses: vmactions/openbsd-vm@v1
281281
with:
282282
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
283283
prepare: pkg_add socat curl
@@ -306,7 +306,7 @@ jobs:
306306
307307
308308
NetBSD:
309-
runs-on: macos-12
309+
runs-on: ubuntu-latest
310310
needs: OpenBSD
311311
env:
312312
TEST_DNS : ${{ secrets.TEST_DNS }}
@@ -325,10 +325,10 @@ jobs:
325325
TokenName4: ${{ secrets.TokenName4}}
326326
TokenName5: ${{ secrets.TokenName5}}
327327
steps:
328-
- uses: actions/checkout@v3
328+
- uses: actions/checkout@v4
329329
- name: Clone acmetest
330330
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
331-
- uses: vmactions/netbsd-vm@v0
331+
- uses: vmactions/netbsd-vm@v1
332332
with:
333333
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
334334
prepare: |
@@ -358,7 +358,7 @@ jobs:
358358
359359
360360
DragonFlyBSD:
361-
runs-on: macos-12
361+
runs-on: ubuntu-latest
362362
needs: NetBSD
363363
env:
364364
TEST_DNS : ${{ secrets.TEST_DNS }}
@@ -377,10 +377,10 @@ jobs:
377377
TokenName4: ${{ secrets.TokenName4}}
378378
TokenName5: ${{ secrets.TokenName5}}
379379
steps:
380-
- uses: actions/checkout@v3
380+
- uses: actions/checkout@v4
381381
- name: Clone acmetest
382382
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
383-
- uses: vmactions/dragonflybsd-vm@v0
383+
- uses: vmactions/dragonflybsd-vm@v1
384384
with:
385385
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
386386
prepare: |
@@ -413,7 +413,7 @@ jobs:
413413
414414
415415
Solaris:
416-
runs-on: macos-12
416+
runs-on: ubuntu-latest
417417
needs: DragonFlyBSD
418418
env:
419419
TEST_DNS : ${{ secrets.TEST_DNS }}
@@ -433,10 +433,10 @@ jobs:
433433
TokenName4: ${{ secrets.TokenName4}}
434434
TokenName5: ${{ secrets.TokenName5}}
435435
steps:
436-
- uses: actions/checkout@v3
436+
- uses: actions/checkout@v4
437437
- name: Clone acmetest
438438
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
439-
- uses: vmactions/solaris-vm@v0
439+
- uses: vmactions/solaris-vm@v1
440440
with:
441441
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy HTTPS_INSECURE TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
442442
copyback: false
@@ -463,3 +463,54 @@ jobs:
463463
./letest.sh
464464
465465
466+
Omnios:
467+
runs-on: ubuntu-latest
468+
needs: Solaris
469+
env:
470+
TEST_DNS : ${{ secrets.TEST_DNS }}
471+
TestingDomain: ${{ secrets.TestingDomain }}
472+
TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
473+
TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
474+
TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
475+
CASE: le_test_dnsapi
476+
TEST_LOCAL: 1
477+
DEBUG: ${{ secrets.DEBUG }}
478+
http_proxy: ${{ secrets.http_proxy }}
479+
https_proxy: ${{ secrets.https_proxy }}
480+
HTTPS_INSECURE: 1 # always set to 1 to ignore https error, since Omnios doesn't accept the expired ISRG X1 root
481+
TokenName1: ${{ secrets.TokenName1}}
482+
TokenName2: ${{ secrets.TokenName2}}
483+
TokenName3: ${{ secrets.TokenName3}}
484+
TokenName4: ${{ secrets.TokenName4}}
485+
TokenName5: ${{ secrets.TokenName5}}
486+
steps:
487+
- uses: actions/checkout@v4
488+
- name: Clone acmetest
489+
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
490+
- uses: vmactions/omnios-vm@v1
491+
with:
492+
envs: 'TEST_DNS TestingDomain TEST_DNS_NO_WILDCARD TEST_DNS_NO_SUBDOMAIN TEST_DNS_SLEEP CASE TEST_LOCAL DEBUG http_proxy https_proxy HTTPS_INSECURE TokenName1 TokenName2 TokenName3 TokenName4 TokenName5 ${{ secrets.TokenName1}} ${{ secrets.TokenName2}} ${{ secrets.TokenName3}} ${{ secrets.TokenName4}} ${{ secrets.TokenName5}}'
493+
copyback: false
494+
prepare: pkg install socat
495+
run: |
496+
pkg set-mediator -v -I [email protected] openssl
497+
export PATH=/usr/gnu/bin:$PATH
498+
if [ "${{ secrets.TokenName1}}" ] ; then
499+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
500+
fi
501+
if [ "${{ secrets.TokenName2}}" ] ; then
502+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
503+
fi
504+
if [ "${{ secrets.TokenName3}}" ] ; then
505+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
506+
fi
507+
if [ "${{ secrets.TokenName4}}" ] ; then
508+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
509+
fi
510+
if [ "${{ secrets.TokenName5}}" ] ; then
511+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
512+
fi
513+
cd ../acmetest
514+
./letest.sh
515+
516+

‎.github/workflows/DragonFlyBSD.yml‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
name: DragonFlyBSD
2-
on:
3-
push:
4-
branches:
5-
- '*'
6-
paths:
7-
- '*.sh'
8-
- '.github/workflows/DragonFlyBSD.yml'
9-
10-
pull_request:
11-
branches:
12-
- dev
13-
paths:
14-
- '*.sh'
15-
- '.github/workflows/DragonFlyBSD.yml'
16-
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.ref }}
19-
cancel-in-progress: true
20-
21-
22-
23-
24-
jobs:
25-
DragonFlyBSD:
26-
strategy:
27-
matrix:
28-
include:
29-
- TEST_ACME_Server: "LetsEncrypt.org_test"
30-
CA_ECDSA: ""
31-
CA: ""
32-
CA_EMAIL: ""
33-
TEST_PREFERRED_CHAIN: (STAGING) Pretend Pear X1
34-
#- TEST_ACME_Server: "ZeroSSL.com"
35-
# CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
36-
# CA: "ZeroSSL RSA Domain Secure Site CA"
37-
# CA_EMAIL: "[email protected]"
38-
# TEST_PREFERRED_CHAIN: ""
39-
runs-on: macos-12
40-
env:
41-
TEST_LOCAL: 1
42-
TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
43-
CA_ECDSA: ${{ matrix.CA_ECDSA }}
44-
CA: ${{ matrix.CA }}
45-
CA_EMAIL: ${{ matrix.CA_EMAIL }}
46-
TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
47-
steps:
48-
- uses: actions/checkout@v3
49-
- uses: vmactions/cf-tunnel@v0
50-
id: tunnel
51-
with:
52-
protocol: http
53-
port: 8080
54-
- name: Set envs
55-
run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
56-
- name: Clone acmetest
57-
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
58-
- uses: vmactions/dragonflybsd-vm@v0
59-
with:
60-
envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN'
61-
copyback: "false"
62-
nat: |
63-
"8080": "80"
64-
prepare: |
65-
pkg install -y curl socat libnghttp2
66-
usesh: true
67-
run: |
68-
cd ../acmetest \
69-
&& ./letest.sh
70-
71-
1+
name: DragonFlyBSD
2+
on:
3+
push:
4+
branches:
5+
- '*'
6+
paths:
7+
- '*.sh'
8+
- '.github/workflows/DragonFlyBSD.yml'
9+
10+
pull_request:
11+
branches:
12+
- dev
13+
paths:
14+
- '*.sh'
15+
- '.github/workflows/DragonFlyBSD.yml'
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
20+
21+
22+
23+
jobs:
24+
DragonFlyBSD:
25+
strategy:
26+
matrix:
27+
include:
28+
- TEST_ACME_Server: "LetsEncrypt.org_test"
29+
CA_ECDSA: ""
30+
CA: ""
31+
CA_EMAIL: ""
32+
TEST_PREFERRED_CHAIN: (STAGING) Pretend Pear X1
33+
#- TEST_ACME_Server: "ZeroSSL.com"
34+
# CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"
35+
# CA: "ZeroSSL RSA Domain Secure Site CA"
36+
# CA_EMAIL: "[email protected]"
37+
# TEST_PREFERRED_CHAIN: ""
38+
runs-on: ubuntu-latest
39+
env:
40+
TEST_LOCAL: 1
41+
TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
42+
CA_ECDSA: ${{ matrix.CA_ECDSA }}
43+
CA: ${{ matrix.CA }}
44+
CA_EMAIL: ${{ matrix.CA_EMAIL }}
45+
TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
46+
ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
47+
steps:
48+
- uses: actions/checkout@v4
49+
- uses: vmactions/cf-tunnel@v0
50+
id: tunnel
51+
with:
52+
protocol: http
53+
port: 8080
54+
- name: Set envs
55+
run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
56+
- name: Clone acmetest
57+
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
58+
- uses: vmactions/dragonflybsd-vm@v1
59+
with:
60+
envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
61+
nat: |
62+
"8080": "80"
63+
prepare: |
64+
pkg install -y curl socat libnghttp2
65+
usesh: true
66+
copyback: false
67+
run: |
68+
cd ../acmetest \
69+
&& ./letest.sh
70+
71+

‎.github/workflows/FreeBSD.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# CA: "ZeroSSL RSA Domain Secure Site CA"
4242
# CA_EMAIL: "[email protected]"
4343
# TEST_PREFERRED_CHAIN: ""
44-
runs-on: macos-12
44+
runs-on: ubuntu-latest
4545
env:
4646
TEST_LOCAL: 1
4747
TEST_ACME_Server: ${{ matrix.TEST_ACME_Server }}
@@ -51,7 +51,7 @@ jobs:
5151
TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
5252
ACME_USE_WGET: ${{ matrix.ACME_USE_WGET }}
5353
steps:
54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555
- uses: vmactions/cf-tunnel@v0
5656
id: tunnel
5757
with:
@@ -61,7 +61,7 @@ jobs:
6161
run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV
6262
- name: Clone acmetest
6363
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
64-
- uses: vmactions/freebsd-vm@v0
64+
- uses: vmactions/freebsd-vm@v1
6565
with:
6666
envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
6767
nat: |

‎.github/workflows/Linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
TEST_PREFERRED_CHAIN: (STAGING) Pretend Pear X1
3434
TEST_ACME_Server: "LetsEncrypt.org_test"
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
- name: Clone acmetest
3838
run: |
3939
cd .. \

‎.github/workflows/MacOS.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
CA_EMAIL: ${{ matrix.CA_EMAIL }}
4545
TEST_PREFERRED_CHAIN: ${{ matrix.TEST_PREFERRED_CHAIN }}
4646
steps:
47-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4848
- name: Install tools
4949
run: brew install socat
5050
- name: Clone acmetest

0 commit comments

Comments
 (0)