Skip to content

Commit 6848908

Browse files
authored
ci: fix windows canary and linux more
1 parent 9e4867f commit 6848908

2 files changed

Lines changed: 42 additions & 6 deletions

File tree

.github/workflows/nightly.yml

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,47 @@ jobs:
6767
6868
- name: Check if Discord will startup
6969
run: |
70-
# coproc { xvfb-run -e /dev/stdout ./Discord/Discord --enable-logging; }
71-
# grep -m1 "Finished discord_rpc" <&${COPROC[0]}
72-
# sleep 1
73-
# [[ $COPROC_PID ]] && kill $COPROC_PID
74-
./Discord/Discord --enable-logging
70+
coproc { xvfb-run -e /dev/stdout ./Discord/Discord --enable-logging; }
71+
grep -m1 "Finished discord_rpc" <&${COPROC[0]}
72+
sleep 1
73+
[[ $COPROC_PID ]] && kill $COPROC_PID
74+
timeout-minutes: 3
75+
76+
test-linux-canary:
77+
name: Test Linux Canary
78+
79+
needs: build
80+
runs-on: ubuntu-latest
81+
82+
steps:
83+
- uses: actions/checkout@v2
84+
85+
- name: Retrieve artifact
86+
uses: actions/download-artifact@v4
87+
with:
88+
name: built-asar
89+
path: artifact
90+
91+
- name: Extract artifact
92+
run: |
93+
cp artifact/app.asar .
94+
95+
- name: Download Client with OpenAsar
96+
run: |
97+
wget "https://discord.com/api/download/canary?platform=linux&format=tar.gz" -O discord.tar.gz
98+
tar xf discord.tar.gz
99+
cp app.asar DiscordCanary/resources/app.asar
100+
101+
# workaround https://github.com/electron/electron/issues/42510
102+
sudo chown root ./DiscordCanary/chrome-sandbox
103+
sudo chmod 4755 ./DiscordCanary/chrome-sandbox
104+
105+
- name: Check if Discord will startup
106+
run: |
107+
coproc { xvfb-run -e /dev/stdout ./DiscordCanary/DiscordCanary --enable-logging; }
108+
grep -m1 "Finished discord_rpc" <&${COPROC[0]}
109+
sleep 1
110+
[[ $COPROC_PID ]] && kill $COPROC_PID
75111
timeout-minutes: 3
76112

77113
test-win-stable:

scripts/downloadWin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const fs = require('fs');
44

55
console.log('getting manifest...');
66

7-
get('https://discord.com/api/updates/distributions/app/manifests/latest?channel=stable&platform=win&arch=x64', async (res) => {
7+
get(`https://discord.com/api/updates/distributions/app/manifests/latest?channel=${process.argv[2] ?? 'stable'}&platform=win&arch=x64`, async (res) => {
88
let body = '';
99
res.on('data', (chunk) => {
1010
body += chunk.toString();

0 commit comments

Comments
 (0)