From 4abc5b0be4d55788a0824d49fdd2d139b8548f87 Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 10:08:33 +0200 Subject: [PATCH 1/6] Remove if condition in pr action --- .github/workflows/build_on_pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_on_pr.yml b/.github/workflows/build_on_pr.yml index 35b6f92..e45f6c2 100644 --- a/.github/workflows/build_on_pr.yml +++ b/.github/workflows/build_on_pr.yml @@ -9,7 +9,6 @@ env: jobs: docker: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Checkout From b1ea1af70136ca2f6f6992376065be29a891abb3 Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 09:07:56 +0200 Subject: [PATCH 2/6] Update dev action --- .github/workflows/build_deploy_dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 0cfe0a6..2077c64 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -3,6 +3,7 @@ name: Build and Deploy Dev on: schedule: - cron: '5 4 * * *' + workflow_dispatch: env: IMAGE_NAME: devenv From b6d1ee4cee937e7b389e0d3d1b35576b9e7a3ee6 Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 10:01:22 +0200 Subject: [PATCH 3/6] BUMP RSPM --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 765f583..0f7ef21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -146,7 +146,7 @@ ENV R_VERSION=4.4.1 # Set RSPM snapshot see: # https://packagemanager.posit.co/client/#/repos/cran/setup?r_environment=other&snapshot=2023-10-04&distribution=ubuntu-22.04 -ENV R_REPOS=https://packagemanager.posit.co/cran/__linux__/jammy/2024-09-18 +ENV R_REPOS=https://packagemanager.posit.co/cran/__linux__/jammy/2024-10-01 COPY install_scripts/install_r.sh /tmp/install_r.sh COPY package_lists/r_packages.txt /tmp/r_packages.txt From bd6fcda6781387fc132f432c93dbcf1bcb38a39f Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 12:18:19 +0200 Subject: [PATCH 4/6] Add latex packages --- package_lists/latex_packages.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package_lists/latex_packages.txt b/package_lists/latex_packages.txt index 6b797e1..e99ba06 100644 --- a/package_lists/latex_packages.txt +++ b/package_lists/latex_packages.txt @@ -40,6 +40,7 @@ environ eso-pic eurosym fancybox +fancyvrb filehook filemod fira @@ -65,18 +66,22 @@ latex-tools-dev lineno lipsum listings +lwarp mathtools mdframed media9 mfirstuc +microtype moderncv multirow nomencl nth ocgx2 +palatino paralist pdflscape pdfpages +pgf pgfplots placeins preprint From 03cdf84463a0d76999375f49fd682742879430c9 Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 12:48:53 +0200 Subject: [PATCH 5/6] Fix paths --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f7ef21..092061d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -128,14 +128,14 @@ ENV PATH="/home/vscode/.local/bin:${PATH}" COPY install_scripts/install_latex.sh /tmp/install_latex.sh COPY package_lists/latex_packages.txt /tmp/latex_packages.txt -RUN chmod +x tmp/install_latex.sh &&\ - tmp/install_latex.sh \ +RUN chmod +x /tmp/install_latex.sh &&\ + /tmp/install_latex.sh \ && export PATH="/usr/local/texlive/bin/x86_64-linux:${PATH}" \ && tlmgr option -- autobackup 0 \ && tlmgr option -- docfiles 0 \ && tlmgr option -- srcfiles 0 \ && tlmgr install \ - $(grep -o '^[^#]*' tmp/latex_packages.txt | tr '\n' ' ') \ + $(grep -o '^[^#]*' /tmp/latex_packages.txt | tr '\n' ' ') \ && chown --recursive $USERNAME:$USERNAME /usr/local/texlive # Set Latex Path @@ -152,8 +152,8 @@ COPY install_scripts/install_r.sh /tmp/install_r.sh COPY package_lists/r_packages.txt /tmp/r_packages.txt COPY package_lists/r_packages_github.txt /tmp/r_packages_github.txt -RUN chmod +x tmp/install_r.sh &&\ - tmp/install_r.sh +RUN chmod +x /tmp/install_r.sh &&\ + /tmp/install_r.sh COPY --chown=$USERNAME .misc/.zshrc /home/$USERNAME/. From aaec00c17d61d87afdb386cf94333d76807d7bc0 Mon Sep 17 00:00:00 2001 From: Jonathan Berrisch Date: Wed, 2 Oct 2024 13:06:42 +0200 Subject: [PATCH 6/6] Fix problem with removing /tmp/ directory --- install_scripts/install_latex.sh | 1 - install_scripts/install_r.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/install_scripts/install_latex.sh b/install_scripts/install_latex.sh index 04d0190..7cc3fa7 100644 --- a/install_scripts/install_latex.sh +++ b/install_scripts/install_latex.sh @@ -29,7 +29,6 @@ install Devel::StackTrace echo "main_memory = 7999999" >> /usr/local/texlive/texmf.cnf echo "save_size = 7999999" >> /usr/local/texlive/texmf.cnf -rm -r /tmp/* rm -r /root/.cpan/build/* apt-get autoclean -y rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/install_scripts/install_r.sh b/install_scripts/install_r.sh index f48c676..6f018ed 100644 --- a/install_scripts/install_r.sh +++ b/install_scripts/install_r.sh @@ -74,7 +74,6 @@ R -e "Refinitiv::install_eikon()" chown --recursive $USERNAME:$USERNAME /usr/local/lib/R/site-library -rm -r /tmp/* apt-get autoclean -y rm -rf /var/lib/apt/lists/*