fix: Move commands to correct place (#4579)

* Allow dispatch workflow

* Disable LUA

* Move R installation and cleanup

* Revert "Disable LUA"

This reverts commit d347897d77.

* Move cleaning step
This commit is contained in:
Gustl22 2023-08-25 20:25:04 +02:00 committed by GitHub
parent af9a6d1c15
commit c4c1ebb101
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 2 deletions

View file

@ -3,6 +3,7 @@ name: Build and Test
on: on:
pull_request: pull_request:
merge_group: merge_group:
workflow_dispatch:
jobs: jobs:
test: test:

3
.gitignore vendored
View file

@ -65,6 +65,9 @@ typings/
# clj-kondo cache # clj-kondo cache
.cache .cache
# IDEs
.idea
# default output report # default output report
super-linter.report super-linter.report

View file

@ -244,6 +244,11 @@ RUN --mount=type=secret,id=GITHUB_TOKEN /install-google-java-format.sh && rm -rf
COPY scripts/install-lua.sh / COPY scripts/install-lua.sh /
RUN --mount=type=secret,id=GITHUB_TOKEN /install-lua.sh && rm -rf /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 ############################## # Grab small clean image to build python packages ##############################
################################################################################ ################################################################################

View file

@ -6,3 +6,4 @@ mkdir -p /home/r-library
cp -r /usr/lib/R/library/ /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/')" 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')" R -e "install.packages(list.dirs('/home/r-library',recursive = FALSE), repos = NULL, type = 'source')"
mv /etc/R/* /usr/lib/R/etc/

View file

@ -26,5 +26,3 @@ rm -r cvega-luarocks-6b1aee6
luarocks install luacheck luarocks install luacheck
luarocks install argparse luarocks install argparse
luarocks install luafilesystem luarocks install luafilesystem
mv /etc/R/* /usr/lib/R/etc/
find /usr/ -type f -name '*.md' -exec rm {} +