Compare commits

...

5 commits

Author SHA1 Message Date
dependabot[bot] acadc7042d
Merge ea0ba13750 into a57ad00dd1 2024-04-16 19:34:21 +00:00
Mayel de Borniol a57ad00dd1 update deps 2024-04-16 20:34:11 +01:00
Mayel de Borniol ab93b455d2 path 2024-04-16 16:26:19 +01:00
Mayel de Borniol 4961107e31 mise 2024-04-16 16:18:43 +01:00
dependabot[bot] ea0ba13750
Bump docker/login-action from 1 to 3
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-26 00:23:47 +00:00
6 changed files with 46 additions and 27 deletions

12
.github/workflows/release.yaml vendored Executable file → Normal file
View file

@ -63,7 +63,7 @@ jobs:
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
@ -140,7 +140,7 @@ jobs:
-
name: Install system deps & tools
run: |
chmod +x deps-debian.sh && ./deps-debian.sh
chmod +x deps-debian-build.sh && ./deps-debian-build.sh
echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH
-
name: Check tools
@ -277,11 +277,11 @@ jobs:
# export TERM=${{ env.TERM }}
# case "${{ matrix.distro }}" in
# ubuntu*|jessie|stretch|buster|bullseye)
# # chmod +x deps-debian.sh && ./deps-debian.sh
# # chmod +x deps-debian-build.sh && ./deps-debian-build.sh
# # TODO ^ how to use the script here? (checked out files not available in install step)
# ;;
# alpine*)
# # chmod +x deps-alpine.sh && ./deps-alpine.sh
# # chmod +x deps-alpine-build.sh && ./deps-alpine-build.sh
# ;;
# esac
@ -291,11 +291,11 @@ jobs:
# echo "Run!..."
# case "${{ matrix.distro }}" in
# ubuntu*|jessie|stretch|buster|bullseye)
# chmod +x deps-debian.sh && ./deps-debian.sh
# chmod +x deps-debian-build.sh && ./deps-debian-build.sh
# # TODO ^ do in install step instead
# ;;
# alpine*)
# chmod +x deps-alpine.sh && ./deps-alpine.sh
# chmod +x deps-alpine-build.sh && ./deps-alpine-build.sh
# ;;
# esac
# # . "/opt/asdf/asdf.sh"

View file

@ -164,7 +164,7 @@ RUN apk add --update --no-cache \
openssl-dev \
# ^ for HTTPS, etc
git \
build-base \
# build-base \
# ^ required by tree_magic
tzdata \
gettext \

4
deps-alpine-extra.sh Normal file
View file

@ -0,0 +1,4 @@
apk add bash git tar file build-base gcc sqlite npm mailcap ca-certificates openssl-dev tzdata gettext curl rust cargo just libc-dev elixir
mix local.hex --force
mix local.rebar --force

31
deps-debian-build.sh Normal file
View file

@ -0,0 +1,31 @@
#!/bin/bash
apt-get update -q -y
# runtime deps
chmod +x ./deps-debian.sh
./deps-debian.sh
# dev deps
apt-get install -q -y --no-install-recommends gcc sqlite3 npm rustc cargo
# deps of tools
apt-get install -q -y --no-install-recommends autoconf dpkg-dev gcc g++ make libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1
# tools
# NOTE: using mise because bullseye elixir version is too old
curl https://mise.run | sh
PATH="~/.local/share/mise/shims:~/.local/bin/:$PATH"
echo 'export PATH="~/.local/share/mise/shims:~/.local/bin/:$PATH"' >> ~/.bash_profile
mise plugin-add erlang
mise plugin-add elixir
mise plugin-add just
mise install
# FYI: uses .tool-versions instead of the below
# which erl || (mise install erlang latest && asdf global erlang latest)
# elixir -v || (asdf install elixir latest && asdf global elixir latest) #|| apt-get install -y elixir
# just --version || (asdf install just latest && asdf global just latest) || cargo install just #|| apt-get install -y just
# npm install --global yarn

View file

@ -3,21 +3,8 @@
apt-get update -q -y
# deps
apt-get install -q -y --no-install-recommends git tar file gcc sqlite3 npm mailcap ca-certificates libssl-dev tzdata gettext curl rustc cargo wget gnupg sudo unzip
# deps of tools
apt-get install -q -y --no-install-recommends autoconf dpkg-dev gcc g++ make libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1
# NOTE: using mise because bullseye elixir version is too old
curl https://mise.run | sh
echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bashrc
mise plugin-add erlang && mise plugin-add elixir && mise plugin-add just
mise install
# FYI: uses .tool-versions instead of the below
# which erl || (mise install erlang latest && asdf global erlang latest)
# elixir -v || (asdf install elixir latest && asdf global elixir latest) #|| apt-get install -y elixir
# just --version || (asdf install just latest && asdf global just latest) || cargo install just #|| apt-get install -y just
# npm install --global yarn
apt-get install -q -y --no-install-recommends git tar unzip curl wget file mailcap bash \
ca-certificates openssh-client libgcrypt20-dev libssl-dev gnupg \
tzdata gettext \
imagemagick libvips-tools poppler-utils

View file

@ -903,9 +903,6 @@ nix-db-init: (nix-db "start")
createdb ${PGDATABASE}
createuser -dlsw ${PGUSERNAME}
sys-deps-debian:
./deps-debian.sh
# to test federation locally you can use `just dev-federate` or `just test-federation-live-DRAGONS`
# and run this in seperate terminal to start the above tunnel: `just tunnel`