Update data and commit changesfix

subugoe · Jul 16, 2024 · bf6b667 · bf6b667
1 parent 4bc9518
commit bf6b667
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 551,752 deletions.
diff --git a/.github/workflows/update-data.yaml b/.github/workflows/update-data.yaml
@@ -73,10 +73,11 @@ jobs:
           DATE=$(date +'%Y-%m-%d %H:%M:%S')
           git add data/
           git commit --allow-empty -m "Auto-update of the data package on $DATE" -a
+      
       - name: Update branch
         if: env.result == '1'
         run: |
-          git pull origin ${{ github.head_ref }}
+          git pull --rebase origin ${{ github.head_ref }}
 
       - name: Push changes
         if: env.result == '1'

diff --git a/data-raw/jct_001_get_cr_data.R b/data-raw/jct_001_get_cr_data.R
@@ -49,20 +49,20 @@ usethis::use_data(jct_hybrid_jns, overwrite = TRUE)
 # # Cleaned and enriched version of OAM data
 # # <https://doi.org/10.26165/JUELICH-DATA/VTQXLM>
 
-# oam_hybrid_jns <- readr::read_csv("data-raw/oam_hybrid_jns.csv")
+ oam_hybrid_jns <- readr::read_csv("data-raw/oam_hybrid_jns.csv")
 
 # # Upload to BQ
-# oam_hybrid_jns_path <-
-#   bigrquery::bq_table("subugoe-collaborative", "hoaddata", "oam_hybrid_jns")
-
-# if (bigrquery::bq_table_exists(oam_hybrid_jns_path)) {
-#   bigrquery::bq_table_delete(oam_hybrid_jns_path)
-# }
-# bigrquery::bq_table_upload(
-#   oam_hybrid_jns_path,
-#   oam_hybrid_jns
-# )
-# usethis::use_data(oam_hybrid_jns, overwrite = TRUE)
+ oam_hybrid_jns_path <-
+   bigrquery::bq_table("subugoe-collaborative", "hoaddata", "oam_hybrid_jns")
+
+ if (bigrquery::bq_table_exists(oam_hybrid_jns_path)) {
+   bigrquery::bq_table_delete(oam_hybrid_jns_path)
+ }
+ bigrquery::bq_table_upload(
+   oam_hybrid_jns_path,
+   oam_hybrid_jns
+)
+ usethis::use_data(oam_hybrid_jns, overwrite = TRUE)
 
 # # Combine both journal tables
 # hybrid_jns <- oam_hybrid_jns |>