From 2ff806f38c9d8c27f7db2fa42f5a62a1adf5a70d Mon Sep 17 00:00:00 2001 From: avahoffman Date: Fri, 1 Dec 2023 12:32:32 -0500 Subject: [PATCH 1/3] Ugh actually commit resources --- .github/workflows/build-collection.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-collection.yml b/.github/workflows/build-collection.yml index 90c62f9c..fe8891b6 100644 --- a/.github/workflows/build-collection.yml +++ b/.github/workflows/build-collection.yml @@ -133,7 +133,7 @@ jobs: env: GH_PAT: ${{ secrets.gh_pat }} run: | - git add --force resources/collection.tsv resources/youtube_metadata.csv resources/youtube_shorts_data.csv resources/youtube_demos_data.csv resources/youtube_getting_started_data.csv resources/youtube_gdscn_sars_data.csv + git add --force resources/collection.tsv resources/youtube_*.csv git commit -m 'Add API query files' || echo "No changes to commit" git fetch git merge -s recursive --strategy-option=ours origin/main --allow-unrelated-histories @@ -143,7 +143,7 @@ jobs: if: ${{ inputs.render-type == 'preview' }} run: | branch_name='preview-${{ github.event.pull_request.number }}' - git add --force resources/collection.tsv resources/youtube_metadata.csv resources/youtube_shorts_data.csv resources/youtube_demos_data.csv resources/youtube_getting_started_data.csv resources/youtube_gdscn_sars_data.csv + git add --force resources/collection.tsv resources/youtube_*.csv git commit -m 'Add API query files' || echo "No changes to commit" git fetch git merge -s recursive --strategy-option=theirs origin/${{ github.head_ref }} --allow-unrelated-histories From 828108c7bb21159300109925a9c99957c3c9c95b Mon Sep 17 00:00:00 2001 From: avahoffman Date: Fri, 1 Dec 2023 12:33:08 -0500 Subject: [PATCH 2/3] Bump upload artifact --- .github/workflows/build-collection.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-collection.yml b/.github/workflows/build-collection.yml index fe8891b6..a3503107 100644 --- a/.github/workflows/build-collection.yml +++ b/.github/workflows/build-collection.yml @@ -67,7 +67,7 @@ jobs: Rscript --vanilla "scripts/query_collection.R" --git_pat "$GH_PAT" - name: Archive collection - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: collection path: resources/collection.tsv @@ -86,43 +86,43 @@ jobs: Rscript --vanilla "scripts/query_youtube.R" --yt_key "$YT_KEY" - name: Archive youtube results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_metadata path: resources/youtube_metadata.csv - name: Archive youtube `shorts` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_shorts_data path: resources/youtube_shorts_data.csv - name: Archive youtube `demos` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_demos_data path: resources/youtube_demos_data.csv - name: Archive youtube `getting started` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_getting_started_data path: resources/youtube_getting_started_data.csv - name: Archive youtube `WDL` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_getting_anvil_wdl_data path: resources/youtube_anvil_wdl_data.csv - name: Archive youtube `gdscn sars` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_getting_gdscn_sars_data path: resources/youtube_gdscn_sars_data.csv - name: Archive youtube `gdscn soil protocols` playlist results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: youtube_getting_gdscn_soil_project_data path: resources/youtube_gdscn_soil_project_data.csv From aa4d989e5d506ad8c00ff70ee0062677d8fd958b Mon Sep 17 00:00:00 2001 From: avahoffman Date: Fri, 1 Dec 2023 12:38:03 -0500 Subject: [PATCH 3/3] Correct path --- index.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.Rmd b/index.Rmd index c00e45d5..fbab9dcd 100644 --- a/index.Rmd +++ b/index.Rmd @@ -86,7 +86,7 @@ knitr::kable(make_youtube_table("resources/youtube_gdscn_sars_data.csv"), format ```{r, echo = FALSE, message = FALSE, warning = FALSE} source("scripts/render_youtube_list.R") -knitr::kable(make_youtube_table("youtube_gdscn_soil_project_data.csv"), format = "html") +knitr::kable(make_youtube_table("resources/youtube_gdscn_soil_project_data.csv"), format = "html") ```