update workflows

bc3LC · Aug 27, 2024 · f185ae3 · f185ae3
1 parent 854d3db
commit f185ae3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,10 +3,10 @@ name: build
 on:
   push:
     branches:
-      - gcam-v7.0
+      - gcam-core
+      - gcam-iamcompact
       - dev
-      - dev_gcam7.1
-
+
 jobs:
   R-CMD:
     runs-on: ${{ matrix.config.os }}

diff --git a/.github/workflows/docker_impl.yaml b/.github/workflows/docker_impl.yaml
@@ -3,7 +3,8 @@ name: docker
 on:
   push:
     branches:
-      - gcam-v7.0
+      - gcam-core
+      - gcam-iamcompact
       - dev
 
 jobs:

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -3,7 +3,9 @@ name: docs
 on:
   push:
     branches:
-      - gcam-v7.0
+      - gcam-core
+      - gcam-iamcompact
+      - dev
 
 jobs:
   pkgdown:

diff --git a/.github/workflows/draft-pdf.yml b/.github/workflows/draft-pdf.yml
@@ -3,7 +3,9 @@ name: draft-pdf
 on:
   push:
     branches:
-      - gcam-v7.0
+      - gcam-core
+      - gcam-iamcompact
+      - dev
 
 jobs:
   paper:

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
@@ -3,7 +3,8 @@ name: test_coverage
 on:
   push:
     branches:
-      - gcam-v7.0
+      - gcam-core
+      - gcam-iamcompact
       - dev
 
 jobs:

diff --git a/R/functions.R b/R/functions.R
@@ -1880,8 +1880,8 @@ get_energy_price_fragmented <- function(GCAM_version = "v7.0") {
   if (NA %in% unique(tmp1$market)) {
     warning('ATTENTION: At least one scenario does not contain CO2 price')
   }
-  if (!dplyr::all_of(unique(tmp1$market) %in% c(unique(CO2_market_filteredReg$market),NA))) {
-    missing_markets <- setdiff(unique(tmp1$market), unique(CO2_market_filteredReg$market))
+  missing_markets <- setdiff(unique(tmp1$market), unique(CO2_market_filteredReg$market))
+  if (length(missing_markets) != 0) {
     warning(sprintf('ATTENTION: The CO2 markets %s are not present in the `co2_market_new` mapping file.',
                     paste(missing_markets, collapse = ", ")))