Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7160557

Browse files
committed
Experiment with fix for hang; add MOV output
1 parent 95efeb2 commit 7160557

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,15 @@ jobs:
5656
if: runner.os == 'Linux'
5757
- name: Start Screen Recording
5858
run: |
59+
mkdir -p $PWD/videos
5960
no_close=--no-close # uncomment to see ffmpeg output (i.e. leave stdio open)
60-
start-stop-daemon $no_close --start --quiet --pidfile ~/var/run/ffmpeg.pid --make-pidfile --background --exec /usr/bin/ffmpeg -- -nostdin -f x11grab -video_size 1280x1024 -framerate 10 -i ${DISPLAY}.0+0,0 $PWD/test.mp4
61-
pid=`cat ~/var/run/ffmpeg.pid`
62-
echo "Waiting for ffmpeg (pid $pid) to start recording (display $DISPLAY)..."
63-
while [ ! -f $PWD/test.mp4 ]; do
64-
echo -n .
65-
sleep 3
66-
done
61+
start-stop-daemon $no_close --start --quiet --pidfile ~/var/run/ffmpeg.pid --make-pidfile --background --exec /usr/bin/ffmpeg -- -nostdin -f x11grab -video_size 1280x1024 -framerate 10 -i ${DISPLAY}.0+0,0 $PWD/videos/test.mp4
62+
# pid=`cat ~/var/run/ffmpeg.pid`
63+
# echo "Waiting for ffmpeg (pid $pid) to start recording (display $DISPLAY)..."
64+
# while [ ! -f $PWD/videos/test.mp4 ]; do
65+
# echo -n .
66+
# sleep 3
67+
# done
6768
if: runner.os == 'Linux'
6869
# - name: Setup SSH Debugging
6970
# uses: lhotari/action-upterm@v1
@@ -75,13 +76,14 @@ jobs:
7576
run: |
7677
start-stop-daemon --stop --pidfile ~/var/run/ffmpeg.pid
7778
sleep 3
79+
ffmpeg -i $PWD/videos/test.mp4 -f mov $PWD/videos/test.mov
7880
if: always() && runner.os == 'Linux'
7981
- name: Archive Screen Recording
8082
uses: actions/upload-artifact@v3
8183
with:
8284
name: test-video
8385
path: |
84-
test.mp4
86+
videos/
8587
if: always() && runner.os == 'Linux'
8688
- name: Teardown GUI Environment
8789
run: |

src/test/suite/automation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { Uri, commands, window, workspace } from 'vscode';
1010
// but we need somewhere to put temp files.
1111
const WORKSPACE_FOLDER = fs.mkdtempSync(`${os.tmpdir()}${path.sep}vscode-syntax-tree-`);
1212

13+
// may be harmful in CI
1314
export async function startExtension() {
1415
await commands.executeCommand('syntaxTree.start');
1516
}

src/test/suite/index.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ end
1616
`;
1717

1818
suite('Syntax Tree', () => {
19-
before(auto.startExtension);
19+
// may be harmful in CI
20+
//before(auto.startExtension);
2021
test('Format Document', async () => {
2122
await auto.closeAll();
2223
const editor = await auto.createEditor(UNFORMATTED);

0 commit comments

Comments
 (0)