Skip to content

Commit 7320c1e

Browse files
somehowchrissomehowchris
authored
feat: sync install
1 parent ce1ac0f commit 7320c1e

File tree

8 files changed

+69
-47
lines changed

8 files changed

+69
-47
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
matrix:
1818
dockerfile: ["Containerfile.codespaces", "Containerfile.gitpod"]
1919
steps:
20+
- name: Maximize build space
21+
uses: easimon/maximize-build-space@master
22+
with:
23+
remove-dotnet: 'true'
24+
remove-android: 'true'
2025
- name: Checkout repository and submodules
2126
uses: actions/checkout@v3
2227
with:

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ jobs:
2424
- path: "Containerfile.gitpod"
2525
name: "gitpod"
2626
steps:
27+
- name: Maximize build space
28+
uses: easimon/maximize-build-space@master
29+
with:
30+
remove-dotnet: 'true'
31+
remove-android: 'true'
2732
- name: Checkout repository and submodules
2833
uses: actions/checkout@v3
2934
with:

‎Containerfile.codespaces‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ COPY scripts/install/rust_tooling.sh /setup/install/rust_tooling.sh
1111
RUN bash /setup/install/rust_tooling.sh
1212

1313
COPY scripts/install/cargo_tooling.sh /setup/install/cargo_tooling.sh
14-
RUN bash /setup/install/cargo_tooling.sh
14+
RUN bash /setup/install/cargo_tooling.sh
1515

1616
COPY scripts/install/container_tooling.sh /setup/install/container_tooling.sh
17-
RUN bash /setup/install/container_tooling.sh
17+
RUN sudo bash /setup/install/container_tooling.sh
1818

1919
COPY scripts/install/act.sh /setup/install/act.sh
2020
RUN bash /setup/install/act.sh

‎Containerfile.gitpod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COPY scripts/install/cargo_tooling.sh /setup/install/cargo_tooling.sh
1414
RUN bash /setup/install/cargo_tooling.sh
1515

1616
COPY scripts/install/container_tooling.sh /setup/install/container_tooling.sh
17-
RUN bash /setup/install/container_tooling.sh
17+
RUN sudo bash /setup/install/container_tooling.sh
1818

1919
COPY scripts/install/act.sh /setup/install/act.sh
2020
RUN bash /setup/install/act.sh

‎scripts/install/apt_packages.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd6
2222
valgrind\
2323
build-essential\
2424
apt-utils\
25+
libclang-dev\
2526
&& sudo rm -rf /var/lib/apt/lists/*

‎scripts/install/cargo_tooling.sh‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,41 @@ set -o pipefail
66
sudo wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-$(uname -m)-unknown-linux-musl.tgz -O /usr/local/bin/cargo-binstall.tgz
77
sudo tar -xf /usr/local/bin/cargo-binstall.tgz -C /usr/local/bin/
88

9+
# TODO use cargo-binstall once its fixed
910
# install cargo subcommands via cargo-binstall
1011
install_via_cargo_binstall() {
11-
cargo-binstall $1 --no-confirm
12+
cargo install $1 --force
1213
}
1314

14-
install_via_cargo_binstall cargo-watch &\
15-
install_via_cargo_binstall cargo-outdated &\
16-
install_via_cargo_binstall cargo-audit &\
17-
install_via_cargo_binstall cargo-udeps &\
18-
install_via_cargo_binstall cargo-geiger &\
19-
install_via_cargo_binstall cargo-all-features &\
20-
install_via_cargo_binstall cargo-whatfeatures &\
21-
install_via_cargo_binstall cargo-spellcheck &\
22-
install_via_cargo_binstall cargo-expand &\
23-
install_via_cargo_binstall flamegraph &\
24-
install_via_cargo_binstall cargo-tarpaulin &\
25-
install_via_cargo_binstall cargo-nextest &\
26-
install_via_cargo_binstall cargo-benchcmp &\
27-
install_via_cargo_binstall cargo-tomlfmt &\
28-
install_via_cargo_binstall cargo-sort &\
29-
install_via_cargo_binstall cargo-license &\
30-
install_via_cargo_binstall cargo-modules &\
31-
install_via_cargo_binstall cargo-profiler &\
32-
install_via_cargo_binstall cargo-deps &\
33-
install_via_cargo_binstall cargo-deadlinks &\
34-
install_via_cargo_binstall cargo-bloat &\
35-
install_via_cargo_binstall cargo-linked &\
36-
install_via_cargo_binstall cargo-grammarly &\
15+
install_via_cargo_binstall cargo-watch
16+
install_via_cargo_binstall cargo-outdated
17+
install_via_cargo_binstall cargo-audit
18+
install_via_cargo_binstall cargo-udeps
19+
install_via_cargo_binstall cargo-geiger
20+
install_via_cargo_binstall cargo-all-features
21+
install_via_cargo_binstall cargo-whatfeatures
22+
install_via_cargo_binstall cargo-spellcheck
23+
install_via_cargo_binstall cargo-expand
24+
install_via_cargo_binstall flamegraph
25+
install_via_cargo_binstall cargo-tarpaulin
26+
install_via_cargo_binstall cargo-nextest
27+
install_via_cargo_binstall cargo-benchcmp
28+
install_via_cargo_binstall cargo-tomlfmt
29+
install_via_cargo_binstall cargo-sort
30+
install_via_cargo_binstall cargo-license
31+
install_via_cargo_binstall cargo-modules
32+
install_via_cargo_binstall cargo-profiler
33+
install_via_cargo_binstall cargo-deps
34+
install_via_cargo_binstall cargo-deadlinks
35+
install_via_cargo_binstall cargo-bloat
36+
install_via_cargo_binstall cargo-linked
37+
install_via_cargo_binstall cargo-grammarly
38+
install_via_cargo_binstall trunk
39+
install_via_cargo_binstall wasm-bindgen-cli
40+
install_via_cargo_binstall minifier
41+
42+
sudo wget -O /usr/local/bin/minify https://wilsonl.in/minify-html/bin/0.8.0-linux-x86_64
43+
sudo chmod +x /usr/local/bin/minify
44+
3745
# cargo binstall does not use features
38-
cargo install diesel_cli --features=default,postgres,sqlite,mysql --force &\
39-
& wait
46+
cargo install diesel_cli --features=default,postgres,sqlite,mysql --force

‎scripts/install/container_tooling.sh‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121
sudo apt-get update
2222
sudo apt-get upgrade -y
2323
# needs to be installed before podman...
24-
sudo apt-get install -y fuse-overlayfs
24+
sudo apt-get install -y fuse-overlayfs qemu-user-static
2525
sudo apt-get install podman -y
2626

2727
# setting up podman
@@ -32,28 +32,30 @@ sudo sed -i '/^driver = "overlay"/ c\driver = "vfs"' /etc/containers/storage.con
3232
# && sed -i '/^# events_logger = "journald"/ a events_logger = "file"' /etc/containers/containers.conf \
3333

3434

35+
# TODO rootless docker & docker buildx
3536
# docker
36-
sudo apt install kmod -y
37-
echo "export XDG_RUNTIME_DIR=$HOME/.docker/run" | sudo tee -a ~/.bashrc
38-
echo "export PATH=$HOME/bin:$PATH" | sudo tee -a ~/.bashrc
39-
echo "export DOCKER_HOST=unix:///var/run/docker.sock" | sudo tee -a ~/.bashrc
37+
#sudo apt install -y kmod dbus-user-session fuse-overlayfs slirp4netns
38+
#echo "export XDG_RUNTIME_DIR=$HOME/.docker/run" | sudo tee -a ~/.bashrc
39+
#echo "export PATH=$HOME/bin:$PATH" | sudo tee -a ~/.bashrc
40+
#echo "export DOCKER_HOST=unix:///var/run/docker.sock" | sudo tee -a ~/.bashrc
41+
#echo "export FORCE_ROOTLESS_INSTALL=true" | sudo tee -a ~/.bashrc
4042

41-
export XDG_RUNTIME_DIR=$HOME/.docker/run
42-
export PATH=$HOME/bin:$PATH
43-
export DOCKER_HOST=unix:///var/run/docker.sock
43+
#export XDG_RUNTIME_DIR=$HOME/.docker/run
44+
#export PATH=$HOME/bin:$PATH
45+
#export DOCKER_HOST=unix:///var/run/docker.sock
4446

45-
mkdir -p $XDG_RUNTIME_DIR
47+
#mkdir -p $XDG_RUNTIME_DIR
4648

47-
sudo echo "$USER:100000:65536" >> /etc/subuid
48-
sudo echo "$USER:100000:65536" >> /etc/subgid
49+
#echo "$USER:100000:65536" >> /etc/subuid
50+
#echo "$USER:100000:65536" >> /etc/subgid
4951

50-
export FORCE_ROOTLESS_INSTALL="true"
52+
#export FORCE_ROOTLESS_INSTALL="false"
53+
#printenv
54+
#curl -fsSL https://get.docker.com/rootless | sh
5155

52-
curl -fsSL https://get.docker.com/rootless | sh
53-
54-
rm -f /etc/subgid
55-
rm -f /etc/subuid
56+
#rm -f /etc/subgid
57+
#rm -f /etc/subuid
5658

5759
# setup docker buildx
58-
docker buildx create --use
60+
#docker buildx create --use
5961

‎scripts/install/rust_tooling.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ install_rustup_channel_with_components stable-musl &\
1616
install_rustup_channel_with_components beta-gnu &\
1717
install_rustup_channel_with_components nightly-gnu &\
1818
install_rustup_channel_with_components stable-gnu &\
19-
wait
19+
wait
20+
21+
rustup target add wasm32-unknown-unknown

0 commit comments

Comments
 (0)