Skip to content

Commit 9b7e7be

Browse files
🐛 Fix upptime/upptime#918 by adding WARP globally
1 parent 3e32e51 commit 9b7e7be

File tree

1 file changed

+24
-56
lines changed

1 file changed

+24
-56
lines changed

src/helpers/workflows.ts

+24-56
Original file line numberDiff line numberDiff line change
@@ -40,50 +40,6 @@ const introComment = async () => `#
4040
# * More by Anand Chowdhary: https://anandchowdhary.com
4141
`;
4242

43-
const WARP_ACTION = ` - name: Install WARP to support IPv6
44-
run: |
45-
if [ "\${{ inputs.mode }}" == 'client' ]; then
46-
echo "WARP mode: client warp+doh."
47-
sudo apt-get -y update
48-
curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | sudo gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
49-
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/cloudflare-client.list
50-
sudo apt-get update
51-
sudo apt-get install -y cloudflare-warp
52-
sudo warp-cli --accept-tos register
53-
sudo warp-cli --accept-tos set-mode warp+doh
54-
sudo warp-cli --accept-tos connect
55-
56-
elif [ "\${{ inputs.mode }}" == 'wireguard' ]; then
57-
echo "WARP mode: wireguard."
58-
sudo apt-get -y update
59-
sudo apt-get -y install --no-install-recommends net-tools iproute2 openresolv dnsutils iptables wireguard-tools
60-
LAN=$(ip route get 192.168.193.10 | grep -oP 'src \K\S+')
61-
echo "[Interface]
62-
PrivateKey = cKE7LmCF61IhqqABGhvJ44jWXp8fKymcMAEVAzbDF2k=
63-
Address = 172.16.0.2/32
64-
Address = fd01:5ca1:ab1e:823e:e094:eb1c:ff87:1fab/128
65-
PostUp = ip -4 rule add from $LAN lookup main
66-
PostDown = ip -4 rule delete from $LAN lookup main
67-
DNS = 8.8.8.8,8.8.4.4
68-
MTU = 1280
69-
70-
[Peer]
71-
PublicKey = bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=
72-
AllowedIPs = 0.0.0.0/0
73-
AllowedIPs = ::/0
74-
Endpoint = 162.159.193.10:2408" | sed "s/^[ ]\+//g" | sudo tee /etc/wireguard/warp.conf
75-
sudo wg-quick up warp
76-
77-
else
78-
echo -e "WARP mode: \${{ inputs.mode }}.\nYou can choose client or wireguard."
79-
exit 1
80-
fi
81-
82-
sleep 1
83-
sudo curl -s4m8 --retry 3 -A Mozilla https://api.ip.sb/geoip
84-
85-
shell: bash`;
86-
8743
export const graphsCiWorkflow = async () => {
8844
const config = await getConfig();
8945
const workflowSchedule = config.workflowSchedule || {};
@@ -147,12 +103,18 @@ jobs:
147103
uses: actions/checkout@v3
148104
with:
149105
ref: \${{ github.head_ref }}
150-
token: \${{ secrets.GH_PAT || github.token }}${
151-
(await getHasIpV6Site())
152-
? `
153-
${WARP_ACTION}`
154-
: ""
155-
}
106+
token: \${{ secrets.GH_PAT || github.token }}
107+
- name: Install WARP to support IPv6
108+
run: |
109+
sudo apt-get -y update
110+
curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | sudo gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
111+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/cloudflare-client.list
112+
sudo apt-get update
113+
sudo apt-get install -y cloudflare-warp
114+
sudo warp-cli --accept-tos register
115+
sudo warp-cli --accept-tos set-mode warp+doh
116+
sudo warp-cli --accept-tos connect
117+
shell: bash
156118
- name: Update response time
157119
uses: upptime/uptime-monitor@${await getUptimeMonitorVersion()}
158120
with:
@@ -193,12 +155,18 @@ jobs:
193155
with:
194156
command: "update-template"
195157
env:
196-
GH_PAT: \${{ secrets.GH_PAT || github.token }}${
197-
(await getHasIpV6Site())
198-
? `
199-
${WARP_ACTION}`
200-
: ""
201-
}
158+
GH_PAT: \${{ secrets.GH_PAT || github.token }}
159+
- name: Install WARP to support IPv6
160+
run: |
161+
sudo apt-get -y update
162+
curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | sudo gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg
163+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/cloudflare-client.list
164+
sudo apt-get update
165+
sudo apt-get install -y cloudflare-warp
166+
sudo warp-cli --accept-tos register
167+
sudo warp-cli --accept-tos set-mode warp+doh
168+
sudo warp-cli --accept-tos connect
169+
shell: bash
202170
- name: Update response time
203171
uses: upptime/uptime-monitor@${await getUptimeMonitorVersion()}
204172
with:

0 commit comments

Comments
 (0)