mirror of
https://github.com/hoytech/strfry.git
synced 2024-09-19 16:26:33 +00:00
remove perl package deps (they are now vendored in by golpe)
This commit is contained in:
parent
c0dec7c53f
commit
233c50c88b
3
.github/workflows/ubuntu.yml
vendored
3
.github/workflows/ubuntu.yml
vendored
@ -16,8 +16,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
sudo apt update && sudo apt install -y --no-install-recommends \
|
sudo apt update && sudo apt install -y --no-install-recommends \
|
||||||
git g++ make pkg-config libtool ca-certificates \
|
git g++ make pkg-config libtool ca-certificates \
|
||||||
libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
|
libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
|
||||||
liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
|
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
make setup-golpe
|
make setup-golpe
|
||||||
make -j4
|
make -j4
|
||||||
|
@ -18,9 +18,6 @@ RUN \
|
|||||||
pkgconfig \
|
pkgconfig \
|
||||||
libtool \
|
libtool \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
perl-yaml \
|
|
||||||
perl-template-toolkit \
|
|
||||||
perl-app-cpanminus \
|
|
||||||
libressl-dev \
|
libressl-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
lmdb-dev \
|
lmdb-dev \
|
||||||
@ -28,7 +25,6 @@ RUN \
|
|||||||
libsecp256k1-dev \
|
libsecp256k1-dev \
|
||||||
zstd-dev \
|
zstd-dev \
|
||||||
&& rm -rf /var/cache/apk/* \
|
&& rm -rf /var/cache/apk/* \
|
||||||
&& cpanm Regexp::Grammars \
|
|
||||||
&& git submodule update --init \
|
&& git submodule update --init \
|
||||||
&& make setup-golpe \
|
&& make setup-golpe \
|
||||||
&& make -j4
|
&& make -j4
|
||||||
|
2
Makefile
2
Makefile
@ -8,6 +8,6 @@ LDLIBS += -lsecp256k1 -lzstd
|
|||||||
INCS += -Iexternal/negentropy/cpp
|
INCS += -Iexternal/negentropy/cpp
|
||||||
|
|
||||||
build/StrfryTemplates.h: $(shell find src/tmpls/ -type f -name '*.tmpl')
|
build/StrfryTemplates.h: $(shell find src/tmpls/ -type f -name '*.tmpl')
|
||||||
perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
|
PERL5LIB=golpe/vendor/ perl golpe/external/templar/templar.pl src/tmpls/ strfrytmpl $@
|
||||||
|
|
||||||
src/apps/relay/RelayWebsocket.o: build/StrfryTemplates.h
|
src/apps/relay/RelayWebsocket.o: build/StrfryTemplates.h
|
||||||
|
@ -31,7 +31,7 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
|
|||||||
|
|
||||||
#### Linux
|
#### Linux
|
||||||
|
|
||||||
sudo apt install -y git build-essential libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
|
sudo apt install -y git g++ make libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev
|
||||||
git clone https://github.com/hoytech/strfry && cd strfry/
|
git clone https://github.com/hoytech/strfry && cd strfry/
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
make setup-golpe
|
make setup-golpe
|
||||||
@ -39,7 +39,7 @@ A C++20 compiler is required, along with a few other common dependencies. On Deb
|
|||||||
|
|
||||||
#### FreeBSD
|
#### FreeBSD
|
||||||
|
|
||||||
pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng p5-Regexp-Grammars p5-Module-Install-Template p5-YAML
|
pkg install -y gcc gmake cmake git perl5 openssl lmdb flatbuffers libuv libinotify zstr secp256k1 zlib-ng
|
||||||
git clone https://github.com/hoytech/strfry && cd strfry/
|
git clone https://github.com/hoytech/strfry && cd strfry/
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
gmake setup-golpe
|
gmake setup-golpe
|
||||||
|
@ -14,14 +14,9 @@ RUN pacman -Syu --noconfirm
|
|||||||
RUN pacman -S --noconfirm \
|
RUN pacman -S --noconfirm \
|
||||||
# build essentials
|
# build essentials
|
||||||
base-devel git \
|
base-devel git \
|
||||||
# perl stuff
|
|
||||||
cpanminus perl-template-toolkit perl-yaml \
|
|
||||||
# flatbuffers, lmdb, libsecp256k1
|
# flatbuffers, lmdb, libsecp256k1
|
||||||
flatbuffers lmdb libsecp256k1
|
flatbuffers lmdb libsecp256k1
|
||||||
|
|
||||||
# necessary perl pod
|
|
||||||
RUN /usr/bin/vendor_perl/cpanm Regexp::Grammars
|
|
||||||
|
|
||||||
# update submodules
|
# update submodules
|
||||||
RUN git submodule update --init
|
RUN git submodule update --init
|
||||||
|
|
||||||
|
2
golpe
2
golpe
@ -1 +1 @@
|
|||||||
Subproject commit 19ce1715c271eb5c1ae3dc9f422093e4afe6c5e7
|
Subproject commit 5046f9001ab3afc3bb388dbcef5f0ce1362f3e15
|
11
golpe.yaml
11
golpe.yaml
@ -1,7 +1,12 @@
|
|||||||
appName: strfry
|
appName: strfry
|
||||||
onAppStartup: true
|
features:
|
||||||
useGlobalH: true
|
ssl: true
|
||||||
customLMDBSetup: true
|
config: true
|
||||||
|
onAppStartup: true
|
||||||
|
db: true
|
||||||
|
customLMDBSetup: true
|
||||||
|
flatbuffers: true
|
||||||
|
websockets: true
|
||||||
|
|
||||||
flatBuffers: |
|
flatBuffers: |
|
||||||
include "../fbs/nostr-index.fbs";
|
include "../fbs/nostr-index.fbs";
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
with pkgs;
|
with pkgs;
|
||||||
mkShell {
|
mkShell {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
perl perlPackages.YAML perlPackages.TemplateToolkit perlPackages.RegexpGrammars
|
perl lmdb zstd secp256k1 flatbuffers zlib openssl libuv
|
||||||
lmdb zstd secp256k1 flatbuffers zlib openssl libuv
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,8 @@ ENV TZ=Europe/London
|
|||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
RUN apt update && apt install -y --no-install-recommends \
|
RUN apt update && apt install -y --no-install-recommends \
|
||||||
git g++ make pkg-config libtool ca-certificates \
|
git g++ make pkg-config libtool ca-certificates \
|
||||||
libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \
|
libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
|
||||||
liblmdb-dev libflatbuffers-dev libsecp256k1-dev \
|
libsecp256k1-dev libzstd-dev
|
||||||
libzstd-dev
|
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN git submodule update --init
|
RUN git submodule update --init
|
||||||
|
Loading…
Reference in New Issue
Block a user