From ae61734de1c9c18b822d218ea575e3c2661e6e40 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:00:48 -0400 Subject: [PATCH 01/15] Testing the provided workflow. Check details settings.json - updated spellcheck gource.yml: I want to be super duper precise here. I used the "minimal setup example" .yml from the gource-action repository with a couple changes. I am only going to use the Gource Action on pull request for this branch, absolutely not if and when this workflow reaches master. I need to test how long it takes, on average, to generate the video. The action, under the Advanced Example section on the gource-action repo, says it may take up to 17 minutes. I allowed it 8 for this test only. I am expecting the upload to either fail or push a big file to the branch. I will need to work out something with the gitignore if this is undesired. --- .github/workflows/gource.yml | 24 ++++++++++++++++++++++++ .vscode/settings.json | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 .github/workflows/gource.yml diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml new file mode 100644 index 00000000..13a6eefa --- /dev/null +++ b/.github/workflows/gource.yml @@ -0,0 +1,24 @@ +name: Gource Action +on: + pull-request: + branches: [ master ] + +jobs: + action: + timeout-minutes: 18 + runs-on: ubuntu-latest + + steps: + - name: 'Checkout' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: 'Gource Action' + uses: nbprojekt/gource-action@v1 + + - name: 'Upload gource video' + uses: actions/upload-artifact@v2 + with: + name: Gource + path: ./gource/gource.mp4 \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index a49d0d35..7328d863 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,6 +25,8 @@ "subbar", "buttonface", "Wireframe", + "Gource", + "nbprojekt", ], "editor.rulers": [100] } \ No newline at end of file From 183f23e56004360df45d1d3c07b092ae424cca22 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:01:24 -0400 Subject: [PATCH 02/15] VSCode didn't update in time --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 13a6eefa..808dd7be 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -5,7 +5,7 @@ on: jobs: action: - timeout-minutes: 18 + timeout-minutes: 8 runs-on: ubuntu-latest steps: From a1cbcdbcc235673519327e5b2eeae700573cabc9 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:04:42 -0400 Subject: [PATCH 03/15] Forgot to press shift gource.yml - changed - to _ --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 808dd7be..be8271f3 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -1,6 +1,6 @@ name: Gource Action on: - pull-request: + pull_request: branches: [ master ] jobs: From 8919fc51e9ccb81d4d284be896c3cb307736898b Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:17:14 -0400 Subject: [PATCH 04/15] Testing workflow changes gource.yml: Added title, Added logo (?), Added FPS and resolution, And slowed down the time scale a bit --- .github/workflows/gource.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index be8271f3..f1ebb3ae 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -16,6 +16,12 @@ jobs: - name: 'Gource Action' uses: nbprojekt/gource-action@v1 + with: + gource_title: 'Peirce My Heart' + logo_url: 'https://i.pinimg.com/736x/4e/35/fe/4e35fe64dbcd102d48e1fef43613d6e7.jpg' + gource_resolution: '720p' + gource_fps: 60 + gource_time_scale: 1.0 - name: 'Upload gource video' uses: actions/upload-artifact@v2 From 60456ef41982e55ea2db0f46021431c4dbd21ba1 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:24:33 -0400 Subject: [PATCH 05/15] gource gource gource gource gource gource.yml - tweaked resolution, time scale, size of users and title font size --- .github/workflows/gource.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index f1ebb3ae..a9454c3c 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -19,9 +19,11 @@ jobs: with: gource_title: 'Peirce My Heart' logo_url: 'https://i.pinimg.com/736x/4e/35/fe/4e35fe64dbcd102d48e1fef43613d6e7.jpg' - gource_resolution: '720p' + gource_resolution: '1080p' gource_fps: 60 - gource_time_scale: 1.0 + gource_time_scale: 0.7 + gource_user_scale: 0.7 + gource_font_size: 36 - name: 'Upload gource video' uses: actions/upload-artifact@v2 From 30864bf2ae4371a3231220ecd0de27d8b5a18e01 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:50:04 -0400 Subject: [PATCH 06/15] Changed timescale from .7 to .55 --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index a9454c3c..e4e15c3f 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -21,7 +21,7 @@ jobs: logo_url: 'https://i.pinimg.com/736x/4e/35/fe/4e35fe64dbcd102d48e1fef43613d6e7.jpg' gource_resolution: '1080p' gource_fps: 60 - gource_time_scale: 0.7 + gource_time_scale: 0.55 gource_user_scale: 0.7 gource_font_size: 36 From 5abb0915363a3a45a4bee8439513903ecda562a4 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 09:59:40 -0400 Subject: [PATCH 07/15] Changed pull_request to push --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index e4e15c3f..ff20fc8e 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -1,6 +1,6 @@ name: Gource Action on: - pull_request: + push: branches: [ master ] jobs: From 44ea50b6805818ea408d671a188492283a459a82 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 15:01:23 -0400 Subject: [PATCH 08/15] Desired FPS and resolution change --- .github/workflows/gource.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index ff20fc8e..0820685e 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -19,8 +19,8 @@ jobs: with: gource_title: 'Peirce My Heart' logo_url: 'https://i.pinimg.com/736x/4e/35/fe/4e35fe64dbcd102d48e1fef43613d6e7.jpg' - gource_resolution: '1080p' - gource_fps: 60 + gource_resolution: '720p' + gource_fps: 24 gource_time_scale: 0.55 gource_user_scale: 0.7 gource_font_size: 36 From 203e1b8ef1d3c5ad1476ce7aa49e975aca2aee1f Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 19:03:19 -0400 Subject: [PATCH 09/15] Changed mp4 path Testing if this will get rid of the zip file --- .github/workflows/gource.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 0820685e..cc01451e 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -1,6 +1,6 @@ name: Gource Action on: - push: + pull_request: branches: [ master ] jobs: @@ -29,4 +29,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: Gource - path: ./gource/gource.mp4 \ No newline at end of file + path: ./gource.mp4 \ No newline at end of file From 44d83aed2a4a25fb9515d81c906e712ac8710161 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 19:40:21 -0400 Subject: [PATCH 10/15] avatars_auto_fetch true --- .github/workflows/gource.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index cc01451e..96db8b7f 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -24,6 +24,7 @@ jobs: gource_time_scale: 0.55 gource_user_scale: 0.7 gource_font_size: 36 + avatars_auto_fetch: true - name: 'Upload gource video' uses: actions/upload-artifact@v2 From 5f0ff784ea7ab7e0b8099970a9608787ebbf02b0 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 19:41:14 -0400 Subject: [PATCH 11/15] yeah --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 96db8b7f..1cd32c33 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -30,4 +30,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: Gource - path: ./gource.mp4 \ No newline at end of file + path: ./gource/gource.mp4 \ No newline at end of file From d9d342558f0e7894e41ed819f4e02f5f88632924 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 19:51:56 -0400 Subject: [PATCH 12/15] GOURCE NO LIKE 24 FPS. ONLY 25. --- .github/workflows/gource.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 1cd32c33..4631558d 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -20,7 +20,7 @@ jobs: gource_title: 'Peirce My Heart' logo_url: 'https://i.pinimg.com/736x/4e/35/fe/4e35fe64dbcd102d48e1fef43613d6e7.jpg' gource_resolution: '720p' - gource_fps: 24 + gource_fps: 25 gource_time_scale: 0.55 gource_user_scale: 0.7 gource_font_size: 36 From 1da6ca0ed1dddc843720ed0dcdfa615356a64516 Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Sun, 22 Oct 2023 20:12:12 -0400 Subject: [PATCH 13/15] mailmap attempt --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..e82b2eea --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +Ryan Reilly +Dawn Moore +Anusha Tiwari +Subrina Huda \ No newline at end of file From f1845546ca5cc33a5687622eac8d7d2aca119926 Mon Sep 17 00:00:00 2001 From: AnushaTiwari5 Date: Sun, 22 Oct 2023 23:55:39 -0400 Subject: [PATCH 14/15] Added emperor email in mailmap --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index e82b2eea..3ff4931e 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,5 @@ Ryan Reilly Dawn Moore Anusha Tiwari -Subrina Huda \ No newline at end of file +Subrina Huda +James Oswald \ No newline at end of file From ad88e4e70d9015832d44f046b19b649a3eae3b8e Mon Sep 17 00:00:00 2001 From: Ryan Reilly Date: Mon, 23 Oct 2023 11:48:24 -0400 Subject: [PATCH 15/15] Removed avatar_auto_fetch for now --- .github/workflows/gource.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml index 4631558d..b1c2cb8c 100644 --- a/.github/workflows/gource.yml +++ b/.github/workflows/gource.yml @@ -24,8 +24,7 @@ jobs: gource_time_scale: 0.55 gource_user_scale: 0.7 gource_font_size: 36 - avatars_auto_fetch: true - + - name: 'Upload gource video' uses: actions/upload-artifact@v2 with: