From 31a07d93f9ac013ea0dd0d45798a6bffe0d2a31d Mon Sep 17 00:00:00 2001 From: Ralf Weber Date: Thu, 8 May 2025 14:09:57 +0100 Subject: [PATCH 1/3] Revert "Bump rbase to v4.4 for r-xlsxbuilder v0.1.4 (#9)" This reverts commit 83219db28549fa758e9107be7376e1932ac8dae7. --- Dockerfile | 2 +- recipes/r-xlsxbuilder/meta.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index eca8af6..e2d81b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN wget \ RUN conda --version -RUN conda install -y -c conda-forge conda-build conda-verify anaconda-client +RUN conda install -y conda-build conda-verify anaconda-client COPY entrypoint.sh /entrypoint.sh diff --git a/recipes/r-xlsxbuilder/meta.yaml b/recipes/r-xlsxbuilder/meta.yaml index efe04c5..fecf185 100644 --- a/recipes/r-xlsxbuilder/meta.yaml +++ b/recipes/r-xlsxbuilder/meta.yaml @@ -9,17 +9,17 @@ source: - 'https://github.com/computational-metabolomics/{{ name|lower }}/archive/v{{ version|lower }}.tar.gz' md5: fab06db4a481a6e31d6e1950592e49e0 build: - number: 4 + number: 3 rpaths: - lib/R/lib/ - lib/ noarch: generic requirements: host: - - 'r-base >=4.4,<4.5.0a0' + - 'r-base >=4.3,<4.4' - r-openxlsx run: - - 'r-base >=4.4,<4.5.0a0' + - 'r-base >=4.3,<4.4' - r-openxlsx test: commands: From 2c98b613878958b827a3e9011c9fa45da151af19 Mon Sep 17 00:00:00 2001 From: Ralf Weber Date: Thu, 8 May 2025 14:13:53 +0100 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2d81b1..eca8af6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN wget \ RUN conda --version -RUN conda install -y conda-build conda-verify anaconda-client +RUN conda install -y -c conda-forge conda-build conda-verify anaconda-client COPY entrypoint.sh /entrypoint.sh From a59417dfbae4e60685005a4c80fb64cceb5133c3 Mon Sep 17 00:00:00 2001 From: Ralf Weber Date: Thu, 8 May 2025 14:19:46 +0100 Subject: [PATCH 3/3] Update entrypoint.sh --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 1140aa7..ecadf45 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,5 +11,5 @@ conda build -c conda-forge -c computational-metabolomics -c bioconda --output-fo if [[ -n "${INPUT_ANACONDATOKEN}" ]]; then export ANACONDA_API_TOKEN=$INPUT_ANACONDATOKEN - anaconda upload ./noarch/*.tar.bz2 -u computational-metabolomics + anaconda upload ./noarch/*.conda -u computational-metabolomics fi