diff options
| author | mo khan <mo.khan@gmail.com> | 2020-08-04 14:51:49 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-08-07 12:44:29 -0600 |
| commit | ca3e93e2f67707a016b28e58f8374522a1fb68f0 (patch) | |
| tree | 63f5341b5b2ef4732cd0ec3717f9bb01378eb507 /config | |
| parent | 71e548e24191f9afe53f5679906d464b24c5c985 (diff) | |
Add limited network support for Cargo projects
* Add test to scan cargo project with packages from a private registry
* Synchronize mono cert store
* Wipe nuget package cache before specs
* Compress /usr/local/share
* Exclude development dependencies
* Add CHANGELOG entry
Diffstat (limited to 'config')
| -rw-r--r-- | config/files/.bashrc | 1 | ||||
| -rw-r--r-- | config/files/.tool-versions | 2 | ||||
| -rw-r--r-- | config/install.sh | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/config/files/.bashrc b/config/files/.bashrc index fa70e9c..b37ae94 100644 --- a/config/files/.bashrc +++ b/config/files/.bashrc @@ -70,7 +70,6 @@ inflate /usr/lib/erlang.tar.zst /usr/lib inflate /usr/lib/gcc.tar.zst /usr/lib inflate /usr/lib/git-core.tar.zst /usr/lib inflate /usr/lib/llvm-7.tar.zst /usr/lib -inflate /usr/lib/rustlib.tar.zst /usr/lib inflate /usr/share.tar.zst /usr # shellcheck source=/dev/null diff --git a/config/files/.tool-versions b/config/files/.tool-versions index 41b41e6..968bd25 100644 --- a/config/files/.tool-versions +++ b/config/files/.tool-versions @@ -7,5 +7,5 @@ nodejs 12.16.3 10.20.1 php 7.4.5 python 3.8.2 2.7.18 ruby 2.6.6 -rust system +rust 1.45.0 sbt 1.3.8 diff --git a/config/install.sh b/config/install.sh index 62a64fd..dc32ed2 100644 --- a/config/install.sh +++ b/config/install.sh @@ -62,7 +62,6 @@ apt-get install -y --no-install-recommends \ python-openssl \ re2c \ rebar \ - rustc \ software-properties-common \ sudo \ tk-dev \ @@ -94,6 +93,7 @@ while IFS= read -r line; do done < "/opt/gitlab/.tool-versions" bash "$ASDF_DATA_DIR/plugins/nodejs/bin/import-release-team-keyring" asdf install +rm -fr "$ASDF_DATA_DIR/installs/rust" asdf reshim asdf current @@ -198,11 +198,11 @@ tar --use-compress-program "$zstd_command" -cf /usr/lib/erlang.tar.zst erlang & tar --use-compress-program "$zstd_command" -cf /usr/lib/gcc.tar.zst gcc & tar --use-compress-program "$zstd_command" -cf /usr/lib/git-core.tar.zst git-core & tar --use-compress-program "$zstd_command" -cf /usr/lib/llvm-7.tar.zst llvm-7 & -tar --use-compress-program "$zstd_command" -cf /usr/lib/rustlib.tar.zst rustlib & wait +# shellcheck disable=SC2114 rm -fr \ - /opt/asdf/ \ + "$ASDF_DATA_DIR" \ /opt/gitlab/.m2 \ /opt/gitlab/.cache \ /opt/gitlab/.config \ @@ -213,5 +213,5 @@ rm -fr \ /usr/lib/gcc \ /usr/lib/git-core \ /usr/lib/llvm-7 \ - /usr/lib/rustlib + /usr/share echo -e "section_end:$(date +%s):compress_files\r\e[0K" |