Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update for upstream 1.11.4 #52

Merged
merged 1 commit into from
Sep 6, 2023
Merged

update for upstream 1.11.4 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nicolasdorier/nbxplorer:2.3.65 as nbx-builder
FROM nicolasdorier/nbxplorer:2.3.66 as nbx-builder

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS actions-builder
WORKDIR /actions
Expand All @@ -7,7 +7,7 @@ RUN dotnet restore "utils/actions/actions.csproj"
WORKDIR "/actions"
RUN dotnet build "utils/actions/actions.csproj" -c Release -o /actions/build

FROM btcpayserver/btcpayserver:1.10.3
FROM btcpayserver/btcpayserver:1.11.4

COPY --from=nbx-builder "/app" /nbxplorer
COPY --from=actions-builder "/actions/build" /actions
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ clean:
rm -rf configurator/target

verify: $(PKG_ID).s9pk
embassy-sdk verify s9pk $(PKG_ID).s9pk
start-sdk verify s9pk $(PKG_ID).s9pk

# assumes /etc/embassy/config.yaml exists on local system with `host: "http://embassy-server-name.local"` configured
install: $(PKG_ID).s9pk
embassy-cli package install $(PKG_ID).s9pk
start-cli package install $(PKG_ID).s9pk

$(PKG_ID).s9pk: manifest.yaml instructions.md LICENSE icon.png scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar
embassy-sdk pack
start-sdk pack

docker-images/x86_64.tar: configurator/target/x86_64-unknown-linux-musl/release/configurator $(UTILS_SRC) Dockerfile
ifeq ($(ARCH),aarch64)
Expand All @@ -43,10 +43,10 @@ else
endif

configurator/target/aarch64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC)
docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src start9/rust-musl-cross:aarch64-musl cargo +beta build --release
docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src start9/rust-musl-cross:aarch64-musl cargo build --release --config net.git-fetch-with-cli=true

configurator/target/x86_64-unknown-linux-musl/release/configurator: $(CONFIGURATOR_SRC)
docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src start9/rust-musl-cross:x86_64-musl cargo +beta build --release
docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/configurator:/home/rust/src start9/rust-musl-cross:x86_64-musl cargo build --release --config net.git-fetch-with-cli=true

instructions.md: docs/instructions.md $(DOC_ASSETS)
cd docs && md-packer < instructions.md > ../instructions.md
Expand Down
6 changes: 2 additions & 4 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
id: btcpayserver
title: BTCPay Server
version: 1.10.3.1
version: 1.11.4
release-notes: |
* Updates to the upstream release of [v1.10.3](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.10.3)
* Removes deprecated optional dependency of BTC RPC Proxy
* Uses Bitcoin Core as direct dependency in pruned or full archival mode
* Updates to the upstream release of [v1.11.4](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.11.4)
license: mit
wrapper-repo: "https://github.com/Start9Labs/btcpayserver-wrapper"
upstream-repo: "https://github.com/btcpayserver/btcpayserver"
Expand Down