Skip to content

Commit

Permalink
Bump devel to 3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
almahmoud committed Nov 5, 2024
1 parent 4524baa commit 520d9dd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/daily-rocker-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
rver:
default: "devel"
biocver:
default: "3.20"
default: "3.21"
check-rocker-image:
default: "rocker/rstudio"
schedule:
Expand All @@ -21,7 +21,7 @@ jobs:
id: defs
run: |
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
BIOCVER=$(echo ${{ github.event.inputs.biocver || '3.20' }})
BIOCVER=$(echo ${{ github.event.inputs.biocver || '3.21' }})
echo "develbiocver=$BIOCVER" >> $GITHUB_OUTPUT
echo check-rocker-image=$(echo ${{ github.event.inputs.check-rocker-image || 'rocker/rstudio' }}) >> $GITHUB_OUTPUT
RELEASE_BIOC_VER=$(echo "${BIOCVER%.*}.$((${BIOCVER##*.}-1))")
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
id: defs
run: |
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT
echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
id: defs
run: |
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT
echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
id: defs
run: |
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT
echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
id: defs
run: |
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT
echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/full-rstudio-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
rver:
default: "devel"
biocver:
default: "3.20"
default: "3.21"
outname:
default: "bioconductor_docker"
schedule:
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
run: |
echo outname=$(echo ${{ github.event.inputs.outname || 'bioconductor_docker' }}) >> $GITHUB_OUTPUT
echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT
echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT
echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENV TARGETARCH=${TARGETARCH:-amd64}
FROM base-$TARGETARCH AS base

## Set Dockerfile version number
ARG BIOCONDUCTOR_VERSION=3.20
ARG BIOCONDUCTOR_VERSION=3.21

##### IMPORTANT ########
## The PATCH version number should be incremented each time
Expand Down Expand Up @@ -62,7 +62,7 @@ LABEL name="bioconductor/bioconductor_docker" \
license="Artistic-2.0"

# Reset args in last layer
ARG BIOCONDUCTOR_VERSION=3.20
ARG BIOCONDUCTOR_VERSION=3.21
ARG BIOCONDUCTOR_PATCH=29
ARG BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_VERSION}.${BIOCONDUCTOR_PATCH}

Expand Down
2 changes: 1 addition & 1 deletion bioc_scripts/install_bioc_sysdeps.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

BIOC_VERSION=${1:-"3.20"}
BIOC_VERSION=${1:-"3.21"}

# This is to avoid the error
# 'debconf: unable to initialize frontend: Dialog'
Expand Down

0 comments on commit 520d9dd

Please sign in to comment.