319 release prep (#148)

* Update versions for 3.19 release * Exit before tagging if R versions mismatch * 4.4.0 for 3.20 * Make fixed to salt config
Bioconductor · May 2, 2024 · e032b4f · e032b4f
1 parent 12b500b
commit e032b4f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build_ghcr.yaml b/.github/workflows/build_ghcr.yaml
@@ -107,6 +107,13 @@ jobs:
 
       - name: Export digest by ubuntu and r versions
         run: |
+          R_VER_EXPECTED=$(curl https://bioconductor.org/config.yaml | yq e '.r_ver_for_bioc_ver."${{steps.versions.outputs.biocver}}"')
+          R_VER_FOUND="${{steps.versions.outputs.rver}}"
+          R_FOUND_MAJOR_MINOR=${R_VER_FOUND%.*}
+          if [ "$R_FOUND_MAJOR_MINOR" != "$R_VER_EXPECTED" ]; then
+            echo "Mismatched versions found '$R_VER_FOUND' and expected '$R_VER_EXPECTED'"
+            exit 1
+          fi
           digest="${{ steps.build.outputs.digest }}"
           mkdir -p /tmp/digests/${{steps.versions.outputs.baseprefix}}${{matrix.ubuntu}}
           touch "/tmp/digests/${{steps.versions.outputs.baseprefix}}${{matrix.ubuntu}}/${digest#sha256:}"

diff --git a/saltstack/pillar/custom/devel_standalone.sls b/saltstack/pillar/custom/devel_standalone.sls
@@ -1,12 +1,12 @@
 {# Custom Settings #}
 
 {% set branch = 'devel' %} {# Use 'release' or 'devel' #}
-{% set version = '3.19' %}
+{% set version = '3.20' %}
 {% set environment = 'dev' %} {# Use 'dev' or 'prod' #}
-{% set r_download = 'https://stat.ethz.ch/R/daily/R-devel.tar.gz' %}
+{% set r_download = 'https://cran.r-project.org/src/base/R-4/R-4.4.0.tar.gz' %}
 {% set r_version = 'R-4.4' %}
 {% set r_previous_version = 'R-4.3' %}
-{% set cycle = 'patch' %} {# Use 'devel' for Spring to Fall, 'patch' for Fall to Spring #}
+{% set cycle = 'devel' %} {# Use 'devel' for Spring to Fall, 'patch' for Fall to Spring #}
 {% set name = 'bbs-machine' %}
 {% set immunespace_pwd = '' %}
 {% set create_users = False %}

diff --git a/saltstack/pillar/custom/release_standalone.sls b/saltstack/pillar/custom/release_standalone.sls
@@ -1,11 +1,11 @@
 {# Custom Settings #}
 
 {% set branch = 'release' %} {# Use 'release' or 'devel' #}
-{% set version = '3.18' %}
+{% set version = '3.19' %}
 {% set environment = 'dev' %} {# Use 'dev' or 'prod' #}
-{% set r_download = 'https://cran.r-project.org/src/base/R-4/R-4.3.3.tar.gz' %}
-{% set r_version = 'R-4.3' %}
-{% set r_previous_version = 'R-4.2' %}
+{% set r_download = 'https://cran.r-project.org/src/base/R-4/R-4.4.0.tar.gz' %}
+{% set r_version = 'R-4.4' %}
+{% set r_previous_version = 'R-4.3' %}
 {% set cycle = 'patch' %} {# Use 'devel' for Spring to Fall, 'patch' for Fall to Spring #}
 {% set name = 'bbs-machine' %}
 {% set immunespace_pwd = '' %}