Merge branch 'devel' into config/reset-vscode-indent-settings

Author: hturner

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "R-Dev-Env",
-    "image": "ghcr.io/r-devel/r-dev-env:main",
+    "image": "ghcr.io/r-devel/r-dev-env:devel",
     "hostRequirements": {
         "cpus": 4
     },

.github/workflows/build-and-publish-image.yml

@@ -16,18 +16,20 @@ on:
       - 'reinstall-cmake.sh'
       - 'VERSION'
 
+permissions:
+  contents: read
+  packages: write
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push-image:
-    if: ${{github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true}}
+    if:  |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
 
     steps:
       - name: Checkout repository

.github/workflows/build-gitpod-image.yml

@@ -17,18 +17,20 @@ on:
       - 'reinstall-cmake.sh'
       - 'VERSION'
 
+permissions:
+  contents: read
+  packages: write
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push-image:
-    if: ${{github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true}}
+    if:  |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
 
     steps:
       - name: Checkout repository

.github/workflows/build-mkdocs-website.yml

@@ -12,7 +12,7 @@ on:
 
 permissions:
   contents: write
-  
+
 jobs:
   build-and-deploy:
     if: |

.github/workflows/optimize-docs-images.yml

@@ -1,6 +1,7 @@
 name: Optimize Docs Images
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: ["main","devel"]
     types: [closed]
@@ -9,7 +10,9 @@ on:
 
 jobs:
   optimize-images:
-    if: ${{github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true}}
+    if:  |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/schedule-docker-build.yml

@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: '0 0 1,15 * *'
 
+permissions:
+  contents: read
+  packages: write
 
 env:
   REGISTRY: ghcr.io
@@ -12,9 +15,6 @@ env:
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
     strategy:
       matrix:
         branch: [main, devel]

.gitpod.Dockerfile

@@ -13,15 +13,18 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
     && rm -f /tmp/reinstall-cmake.sh
 
 RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
-    && echo "deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" >> /etc/apt/sources.list \
+    && apt -y update \
+    && apt install -y --no-install-recommends \
+      software-properties-common \
+      subversion \
+      valgrind \
+    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
     && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
-    && apt update \
-    && apt -y install subversion \
     && apt -y build-dep r-base-dev \
     && apt -y install r-base-dev \
-    && apt -y install valgrind \
     && Rscript -e "install.packages('languageserver', repos='https://cran.rstudio.com')" \
-    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')"
+    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')" \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN apt install -y shellcheck
 RUN apt install -y ccache

Dockerfile

@@ -1,31 +1,28 @@
-FROM mcr.microsoft.com/devcontainers/cpp:dev-ubuntu-22.04
-
-ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="none"
-
-# Optionally install the cmake for vcpkg
-COPY ./reinstall-cmake.sh /tmp/
-
-RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
-    chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
-    fi \
-    && rm -f /tmp/reinstall-cmake.sh
-
-RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
-    && echo "deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" >> /etc/apt/sources.list \
-    && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
-    && apt update \
-    && apt -y install subversion \
-    && apt -y build-dep r-base-dev \
-    && apt -y install r-base-dev \
-    && Rscript -e "install.packages('languageserver', repos='https://cran.rstudio.com')" \
-    && Rscript -e "install.packages('httpgd', repos='https://cran.rstudio.com')"
-
-RUN apt install shellcheck
-RUN apt install -y ccache
-#RUN /usr/sbin/update-ccache-symlinks
-#RUN echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a /home/vscode/.bashrc
-
-
-
-ARG CONTAINER_VERSION
-ENV CONTAINER_VERSION ${CONTAINER_VERSION}
+FROM mcr.microsoft.com/devcontainers/cpp:dev-ubuntu-22.04
+
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="none"
+
+# Optionally install the cmake for vcpkg
+COPY ./reinstall-cmake.sh /tmp/
+
+RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
+    chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+    fi \
+    && rm -f /tmp/reinstall-cmake.sh
+
+# software-properties-common installed for apt-add-repository
+RUN sed -i.bak "/^#.*deb-src.*universe$/s/^# //g" /etc/apt/sources.list \
+    && apt -y update \
+    && apt install -y --no-install-recommends \
+      software-properties-common \
+      subversion \
+    && add-apt-repository --enable-source --yes "ppa:marutter/rrutter4.0" \
+    && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
+    && apt -y build-dep r-base-dev \
+    && apt -y install r-base-dev \
+    && Rscript -e "install.packages(c('languageserver', 'httpgd'), \
+    repos = c(CRAN='https://cloud.r-project.org'))" \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG CONTAINER_VERSION
+ENV CONTAINER_VERSION ${CONTAINER_VERSION}