Why Nostr? What is Njump?
2024-07-03 00:52:51

npub1jk…ffke0 on Nostr: commit 2e51c9d363caad7986b1efdc72b3a1da43b106de Author: @RandyMcMillan ...

commit 2e51c9d363caad7986b1efdc72b3a1da43b106de
Author: @RandyMcMillan <[email protected]>
Date: Sun Feb 11 17:08:35 2024 -0500

gnostr-act: -vbr -W .github/workflows/gnostr-bot.yml

make gnostr-am

diff --git a/.dockerignore b/.dockerignore
index 1a42b34a8..a7485df71 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+!CMakeLists.txt
#act: since act is a docker utility, we tell docker to NOT ignore the
#
## WARNING gnostr-act/docker
diff --git a/.github/workflows/gnostr-bot.yml b/.github/workflows/gnostr-bot.yml
index 89aef7832..765e04914 100644
--- a/.github/workflows/gnostr-bot.yml
+++ b/.github/workflows/gnostr-bot.yml
@@ -36,22 +36,23 @@ jobs:
uses: actions/checkout@v3
if: ${{ !env.ACT }}
with:
- fetch-depth: '0'
+ fetch-depth: '10'
submodules: 'true'
set-safe-directory: 'true'
- run: git config --global --add safe.directory /__w/gnostr/gnostr || true
- run: printenv
- - run: apt-get update
- - run: apt-get install -y cargo-doc clang-14-doc wasi-libc cmake-doc cmake-format elpa-cmake-mode ninja-build autopoint gettext-doc libasprintf-dev libgettextpo-dev lrzip llvm-14-doc python3-setuptools python-pygments-doc ttf-bitstream-vera lld-14
- - run: apt-get install -y lib32stdc++6 libc6-i386 lib32gcc-s1 || true
+ - run: apt-get update && apt-get install apt -y
+ - run: apt-get install cmake make sudo -y #&& cmake -S .
+ - run: apt-get install golang-1.19-go golang-1.19-src golang-go golang-src
+ - run: apt-get install -y cargo-doc clang-14-doc wasi-libc cmake-doc cmake-format elpa-cmake-mode ninja-build autopoint gettext-doc libasprintf-dev libgettextpo-dev lrzip llvm-14-doc python3-setuptools python-pygments-doc
+ - run: apt-get install -y lib32stdc++6 libc6-i386 lib32gcc-s1 ttf-bitstream-vera lld-14 || true
- run: apt-get install binfmt-support cargo clang clang-14 cmake cmake-data gettext gettext-base libarchive13 libclang-common-14-dev libclang-cpp14 libclang-rt-14-dev libclang1-14 libcurl3-nss libgc1 libgit2-1.5 libhttp-parser2.9 libjsoncpp25 libllvm14 libmbedcrypto7 libmbedtls14 libmbedx509-1 libnspr4 libnss3 libobjc-12-dev libobjc4 libpfm4 libpipeline1 librhash0 libstd-rust-1.63 libstd-rust-dev libuv1 libz3-4 libz3-dev llvm-14 llvm-14-dev llvm-14-linker-tools llvm-14-runtime llvm-14-tools nss-plugin-pem python-is-python3 python3-pkg-resources python3-pygments python3-yaml rustc sudo -y
- run: cargo install gnostr-sha256
- run: cargo install gnostr-bins
- - run: rm -rf CMakeCache.txt
- - run: rm -rf CMakeFiles
- - run: cmake .
- - run: V=1 make detect gnostr gnostr-install
+ ## NOTE: make gnostr-am is the non-cmake build
+ - run: V=1 make gnostr-am gnostr-install
- run: echo $(date +%s)
- run: gnostr --sec $(gnostr-sha256 $(gnostr-weeble)) -t gnostr --tag weeble $(gnostr-weeble) --tag wobble $(gnostr-wobble) --tag blockheight $(gnostr-blockheight) --content "$(gnostr-weeble)/$(gnostr-blockheight)/$(gnostr-wobble)" | gnostr-post-event wss://relay.damus.io
- run: gnostr --sec $(gnostr-sha256 $(gnostr-weeble)$(gnostr-blockheight)) -t gnostr --tag weeble $(gnostr-weeble) --tag wobble $(gnostr-wobble) --tag blockheight $(gnostr-blockheight) --content "$(gnostr-weeble)/$(gnostr-blockheight)/$(gnostr-wobble)" | gnostr-post-event wss://relay.damus.io
-
+ - run: gnostr-nip --sec $(gnostr-sha256 $(gnostr-weeble))
+ - run: gnostr-nip --sec $(gnostr-sha256 $(gnostr-weeble)$(gnostr-blockheight))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1861fcf..ffa66553e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,9 +42,13 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/json-3.11.2/single_include)
include_directories(${CMAKE_SOURCE_DIR}/ext/secp256k1-0.3.2/include)
include_directories(${CMAKE_SOURCE_DIR}/ext/curl-8.5.0/include/curl)

+include_directories(${CMAKE_SOURCE_DIR}/src/libcjson/include)
+
add_subdirectory(${CMAKE_SOURCE_DIR}/ext/secp256k1-0.3.2)
add_subdirectory(${CMAKE_SOURCE_DIR}/ext/curl-8.5.0)

+add_subdirectory(${CMAKE_SOURCE_DIR}/src/libcjson)
+
if(BUILD_WEB)
if(MSVC)
if(DEV_MODE)
diff --git a/GNUmakefile b/GNUmakefile
index 0ed45718c..36ac6d121 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -265,31 +265,31 @@ ifneq ($(shell id -u),0)
endif
bash -c "[ '$(shell uname -s)' == 'Linux' ] && type -P brew >/tmp/gnostr.log && \
export LIBRARY_PATH='$(LIBRARY_PATH):$(brew --prefix)/lib' || echo"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get update || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install autoconf || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install bison || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install build-essential || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install cargo || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install clang || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install cmake-curses-gui || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install cmake || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install expat || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install gettext || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install golang-go || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install libcurl4-openssl-dev || echo"
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install libssl-dev || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install libtool || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install mercurial || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install npm || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install pandoc || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install pkg-config || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install protobuf-compiler || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install python3 || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install python3-pip || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install python-is-python3 || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install util-linux || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install virtualenv || echo "
- bash -c "[ '$(shell uname -s)' == 'Linux' ] && sudo apt-get install zlib1g-dev || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get update || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install autoconf || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install bison || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install build-essential || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install cargo || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install clang || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install cmake-curses-gui || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install cmake || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install expat || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install gettext || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install golang-go || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install libcurl4-openssl-dev || echo"
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install libssl-dev || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install libtool || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install mercurial || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install npm || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install pandoc || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install pkg-config || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install protobuf-compiler || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install python3 || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install python3-pip || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install python-is-python3 || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install util-linux || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install virtualenv || echo "
+ bash -c "[ '$(shell uname -s)' == 'Linux' ] && $(SUDO) apt-get install zlib1g-dev || echo "

## install gvm sequence
@rm -rf $(HOME)/.gvm || echo "not removing ~/.gvm"
Author Public Key
npub1jkcjaz2y7znm8xmjfl93024nf3jutkltxner25mye42paqvuxu4snffke0