From c4c1ebb1013e9b359747c8d3983b7bda6ecf14d7 Mon Sep 17 00:00:00 2001
From: Gustl22 <git@reb0.org>
Date: Fri, 25 Aug 2023 20:25:04 +0200
Subject: [PATCH] fix: Move commands to correct place (#4579)

* Allow dispatch workflow

* Disable LUA

* Move R installation and cleanup

* Revert "Disable LUA"

This reverts commit d347897d77fe6ecc2c96e30db164b39aa729842d.

* Move cleaning step
---
 .github/workflows/ci.yml | 1 +
 .gitignore               | 3 +++
 Dockerfile               | 5 +++++
 scripts/install-lintr.sh | 1 +
 scripts/install-lua.sh   | 2 --
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3ac93d3..8c116134 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ name: Build and Test
 on:
   pull_request:
   merge_group:
+  workflow_dispatch:
 
 jobs:
   test:
diff --git a/.gitignore b/.gitignore
index 546c1d83..a1afcd54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,9 @@ typings/
 # clj-kondo cache
 .cache
 
+# IDEs
+.idea
+
 # default output report
 super-linter.report
 
diff --git a/Dockerfile b/Dockerfile
index 0cd66177..14e06dac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -244,6 +244,11 @@ RUN --mount=type=secret,id=GITHUB_TOKEN /install-google-java-format.sh && rm -rf
 COPY scripts/install-lua.sh /
 RUN --mount=type=secret,id=GITHUB_TOKEN /install-lua.sh && rm -rf /install-lua.sh
 
+#########################
+# Clean to shrink image #
+#########################
+RUN find /usr/ -type f -name '*.md' -exec rm {} +
+
 ################################################################################
 # Grab small clean image to build python packages ##############################
 ################################################################################
diff --git a/scripts/install-lintr.sh b/scripts/install-lintr.sh
index 03a8a772..ea2cd402 100755
--- a/scripts/install-lintr.sh
+++ b/scripts/install-lintr.sh
@@ -6,3 +6,4 @@ mkdir -p /home/r-library
 cp -r /usr/lib/R/library/ /home/r-library/
 Rscript -e "install.packages(c('lintr','purrr'), repos = 'https://cloud.r-project.org/')"
 R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
+mv /etc/R/* /usr/lib/R/etc/
diff --git a/scripts/install-lua.sh b/scripts/install-lua.sh
index d3662c14..e0457b18 100755
--- a/scripts/install-lua.sh
+++ b/scripts/install-lua.sh
@@ -26,5 +26,3 @@ rm -r cvega-luarocks-6b1aee6
 luarocks install luacheck
 luarocks install argparse
 luarocks install luafilesystem
-mv /etc/R/* /usr/lib/R/etc/
-find /usr/ -type f -name '*.md' -exec rm {} +