Skip to content

Commit 1bd2922

Browse files
neilpangneilpang
authored
Merge pull request #6716 from acmesh-official/dev
sync
2 parents 3ae9711 + 47f2412 commit 1bd2922

File tree

9 files changed

+143
-18
lines changed

9 files changed

+143
-18
lines changed

‎.github/workflows/DNS.yml‎

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ jobs:
232232
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}}'
233233
prepare: pkg install -y socat curl
234234
usesh: true
235-
copyback: false
235+
sync: nfs
236236
run: |
237237
if [ "${{ secrets.TokenName1}}" ] ; then
238238
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
@@ -283,7 +283,7 @@ jobs:
283283
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}}'
284284
prepare: pkg_add socat curl libiconv
285285
usesh: true
286-
copyback: false
286+
sync: nfs
287287
run: |
288288
if [ "${{ secrets.TokenName1}}" ] ; then
289289
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
@@ -335,7 +335,7 @@ jobs:
335335
prepare: |
336336
/usr/sbin/pkg_add curl socat
337337
usesh: true
338-
copyback: false
338+
sync: nfs
339339
run: |
340340
if [ "${{ secrets.TokenName1}}" ] ; then
341341
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
@@ -387,7 +387,7 @@ jobs:
387387
prepare: |
388388
pkg install -y curl socat libnghttp2
389389
usesh: true
390-
copyback: false
390+
sync: nfs
391391
run: |
392392
if [ "${{ secrets.TokenName1}}" ] ; then
393393
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
@@ -440,7 +440,7 @@ jobs:
440440
- uses: vmactions/solaris-vm@v1
441441
with:
442442
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}}'
443-
copyback: false
443+
sync: nfs
444444
prepare: |
445445
pkgutil -U
446446
pkgutil -y -i socat
@@ -493,7 +493,56 @@ jobs:
493493
- uses: vmactions/omnios-vm@v1
494494
with:
495495
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}}'
496-
copyback: false
496+
sync: nfs
497+
prepare: pkg install socat
498+
run: |
499+
if [ "${{ secrets.TokenName1}}" ] ; then
500+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
501+
fi
502+
if [ "${{ secrets.TokenName2}}" ] ; then
503+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
504+
fi
505+
if [ "${{ secrets.TokenName3}}" ] ; then
506+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
507+
fi
508+
if [ "${{ secrets.TokenName4}}" ] ; then
509+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
510+
fi
511+
if [ "${{ secrets.TokenName5}}" ] ; then
512+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
513+
fi
514+
cd ../acmetest
515+
./letest.sh
516+
517+
518+
OpenIndiana:
519+
runs-on: ubuntu-latest
520+
needs: Omnios
521+
env:
522+
TEST_DNS : ${{ secrets.TEST_DNS }}
523+
TestingDomain: ${{ secrets.TestingDomain }}
524+
TEST_DNS_NO_WILDCARD: ${{ secrets.TEST_DNS_NO_WILDCARD }}
525+
TEST_DNS_NO_SUBDOMAIN: ${{ secrets.TEST_DNS_NO_SUBDOMAIN }}
526+
TEST_DNS_SLEEP: ${{ secrets.TEST_DNS_SLEEP }}
527+
CASE: le_test_dnsapi
528+
TEST_LOCAL: 1
529+
DEBUG: ${{ secrets.DEBUG }}
530+
http_proxy: ${{ secrets.http_proxy }}
531+
https_proxy: ${{ secrets.https_proxy }}
532+
HTTPS_INSECURE: 1 # always set to 1 to ignore https error, since OpenIndiana doesn't accept the expired ISRG X1 root
533+
TokenName1: ${{ secrets.TokenName1}}
534+
TokenName2: ${{ secrets.TokenName2}}
535+
TokenName3: ${{ secrets.TokenName3}}
536+
TokenName4: ${{ secrets.TokenName4}}
537+
TokenName5: ${{ secrets.TokenName5}}
538+
steps:
539+
- uses: actions/checkout@v4
540+
- name: Clone acmetest
541+
run: cd .. && git clone --depth=1 https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
542+
- uses: vmactions/openindiana-vm@v0
543+
with:
544+
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}}'
545+
sync: nfs
497546
prepare: pkg install socat
498547
run: |
499548
if [ "${{ secrets.TokenName1}}" ] ; then

‎.github/workflows/DragonFlyBSD.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
prepare: |
6464
pkg install -y curl socat libnghttp2
6565
usesh: true
66-
copyback: false
66+
sync: nfs
6767
run: |
6868
cd ../acmetest \
6969
&& ./letest.sh

‎.github/workflows/FreeBSD.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
"8080": "80"
6969
prepare: pkg install -y socat curl wget
7070
usesh: true
71-
copyback: false
71+
sync: nfs
7272
run: |
7373
cd ../acmetest \
7474
&& ./letest.sh

‎.github/workflows/NetBSD.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
prepare: |
6464
/usr/sbin/pkg_add curl socat
6565
usesh: true
66-
copyback: false
66+
sync: nfs
6767
run: |
6868
cd ../acmetest \
6969
&& ./letest.sh

‎.github/workflows/Omnios.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
nat: |
6868
"8080": "80"
6969
prepare: pkg install socat wget
70-
copyback: false
70+
sync: nfs
7171
run: |
7272
cd ../acmetest \
7373
&& ./letest.sh

‎.github/workflows/OpenBSD.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
"8080": "80"
6969
prepare: pkg_add socat curl wget libnghttp2
7070
usesh: true
71-
copyback: false
71+
sync: nfs
7272
run: |
7373
cd ../acmetest \
7474
&& ./letest.sh

‎.github/workflows/OpenIndiana.yml‎

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

‎.github/workflows/Solaris.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
prepare: |
7070
pkgutil -U
7171
pkgutil -y -i socat curl wget
72-
copyback: false
72+
sync: nfs
7373
run: |
7474
cd ../acmetest \
7575
&& ./letest.sh

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<a href="https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml"><img src="https://github.com/acmesh-official/acme.sh/actions/workflows/Solaris.yml/badge.svg" alt="Solaris"></a>
1818
<a href="https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml"><img src="https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml/badge.svg" alt="DragonFlyBSD"></a>
1919
<a href="https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml"><img src="https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml/badge.svg" alt="Omnios"></a>
20+
<a href="https://github.com/acmesh-official/acme.sh/actions/workflows/OpenIndiana.yml"><img src="https://github.com/acmesh-official/acme.sh/actions/workflows/OpenIndiana.yml/badge.svg" alt="OpenIndiana"></a>
2021
</p>
2122

2223
<p align="center">
@@ -94,19 +95,19 @@
9495
|8|[![NetBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/NetBSD.yml)|NetBSD
9596
|9|[![DragonFlyBSD](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/DragonFlyBSD.yml)|DragonFlyBSD
9697
|10|[![Omnios](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Omnios.yml)|Omnios
97-
|11|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)| Debian
98-
|12|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|CentOS
98+
|11|[![OpenIndiana](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenIndiana.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/OpenIndiana.yml)|OpenIndiana
99+
|12|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)| Debian
99100
|13|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|openSUSE
100101
|14|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Alpine Linux (with curl)
101102
|15|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Archlinux
102103
|16|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|fedora
103104
|17|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Kali Linux
104105
|18|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Oracle Linux
105106
|19|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Mageia
106-
|10|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Gentoo Linux
107-
|22|-----| Cloud Linux https://github.com/acmesh-official/acme.sh/issues/111
108-
|23|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
109-
|24|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
107+
|20|[![Linux](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml/badge.svg)](https://github.com/acmesh-official/acme.sh/actions/workflows/Linux.yml)|Gentoo Linux
108+
|21|-----| Cloud Linux https://github.com/acmesh-official/acme.sh/issues/111
109+
|22|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/acmesh-official/acme.sh/wiki/How-to-run-on-OpenWRT)
110+
|23|[![](https://acmesh-official.github.io/acmetest/status/proxmox.svg)](https://github.com/acmesh-official/letest#here-are-the-latest-status)| Proxmox: See Proxmox VE Wiki. Version [4.x, 5.0, 5.1](https://pve.proxmox.com/wiki/HTTPS_Certificate_Configuration_(Version_4.x,_5.0_and_5.1)#Let.27s_Encrypt_using_acme.sh), version [5.2 and up](https://pve.proxmox.com/wiki/Certificate_Management)
110111

111112

112113
> 🧪 Check our [testing project](https://github.com/acmesh-official/acmetest)

0 commit comments

Comments
 (0)