better error logging

obsproject · Oct 5, 2024 · eb92221 · eb92221
1 parent 2ae90d2
commit eb92221
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Build
         run: npm run build
       - name: Push
-        if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
+        if: ${{ github.event_name == 'push' }}
         run: |
           git config --global user.email "<>"
           git config --global user.name "Build Bot"

diff --git a/src/download.ts b/src/download.ts
@@ -436,7 +436,7 @@ function pushChanges(detachedSubmodules: string[], submodules: string[]): void {
 		'UI/cmake/linux/com.obsproject.Studio.desktop',
 		'UI/frontend-plugins/*/data/locale/*-*.ini'
 	]) {
-		exec(`git add '${allowedPath}'`);
+		ACTIONS.info(exec(`git add '${allowedPath}'`));
 	}
 	for (const submodule of submodules) {
 		exec(`git add plugins/${submodule}`);
@@ -450,8 +450,13 @@ function pushChanges(detachedSubmodules: string[], submodules: string[]): void {
 		ACTIONS.info('No changes in main repository. Skipping push.');
 		return;
 	}
-	exec(`git commit -m '${STRINGS.git.commitTitle}'`);
-	exec('git push');
+	try {
+		ACTIONS.info(exec('git log --staged'));
+		exec(`git commit -m '${STRINGS.git.commitTitle}'`);
+		exec('git push');
+	} catch (e) {
+		ACTIONS.setFailed(e as Error);
+	}
 }
 
 (async () => {