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.

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 upstream to JAM v0.2.0 #16

Merged
merged 4 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions .github/workflows/buildService.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build Service

on:
workflow_dispatch:
pull_request:
paths-ignore: ['*.md']
branches: ['main', 'master']
push:
paths-ignore: ['*.md']
branches: ['main', 'master']

jobs:
BuildPackage:
runs-on: ubuntu-latest
steps:
- name: Prepare StartOS SDK
uses: Start9Labs/sdk@v1

- name: Checkout services repository
uses: actions/checkout@v3

- name: Build the service package
id: build
run: |
git submodule update --init --recursive
start-sdk init
make
PACKAGE_ID=$(yq -oy ".id" manifest.*)
echo "::set-output name=package_id::$PACKAGE_ID"
shell: bash

- name: Upload .s9pk
uses: actions/upload-artifact@v3
with:
name: ${{ steps.build.outputs.package_id }}.s9pk
path: ./${{ steps.build.outputs.package_id }}.s9pk

71 changes: 71 additions & 0 deletions .github/workflows/releaseService.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Release Service

on:
push:
tags:
- 'v*.*'

jobs:
ReleasePackage:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Prepare StartOS SDK
uses: Start9Labs/sdk@v1

- name: Checkout services repository
uses: actions/checkout@v3

- name: Build the service package
run: |
git submodule update --init --recursive
start-sdk init
make

- name: Setting package ID and title from the manifest
id: package
run: |
echo "::set-output name=package_id::$(yq -oy ".id" manifest.*)"
echo "::set-output name=package_title::$(yq -oy ".title" manifest.*)"
shell: bash

- name: Generate sha256 checksum
run: |
PACKAGE_ID=${{ steps.package.outputs.package_id }}
sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
shell: bash

- name: Generate changelog
run: |
PACKAGE_ID=${{ steps.package.outputs.package_id }}
echo "## What's Changed" > change-log.txt
yq -oy '.release-notes' manifest.* >> change-log.txt
echo "## SHA256 Hash" >> change-log.txt
echo '```' >> change-log.txt
sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt
echo '```' >> change-log.txt
shell: bash

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ github.ref_name }}
name: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }}
prerelease: true
body_path: change-log.txt
files: |
./${{ steps.package.outputs.package_id }}.s9pk
./${{ steps.package.outputs.package_id }}.s9pk.sha256

- name: Publish to Registry
env:
S9USER: ${{ secrets.S9USER }}
S9PASS: ${{ secrets.S9PASS }}
S9REGISTRY: ${{ secrets.S9REGISTRY }}
run: |
if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
echo "Publish skipped: missing registry credentials."
else
start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ steps.package.outputs.package_id }}.s9pk
fi
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM ghcr.io/joinmarket-webui/jam-standalone:v0.1.6-clientserver-v0.9.10
FROM ghcr.io/joinmarket-webui/jam-standalone:v0.2.0-clientserver-v0.9.11

# arm64 or amd64
ARG PLATFORM
# aarch64 or x86_64
ARG ARCH

RUN sed -i "s|http://|https://|g" /etc/apt/sources.list /etc/apt/sources.list.d/*
RUN apt-get update && apt-get -y upgrade && apt-get install -y -qq --no-install-recommends wget bash tini
RUN apt-get update && apt-get -qqy upgrade && apt-get install -qqy --no-install-recommends wget bash tini && \
rm -rf /var/lib/apt/lists/* /var/cache/apt/*

RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${PLATFORM} && chmod +x /usr/local/bin/yq

# USER root
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Start9 Labs
Copyright (c) 2024 Start9 Labs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,19 @@ docker run --privileged --rm linuxkit/binfmt:v0.8

4. Install yq

Ubuntu:

```
sudo snap install yq
```

Debian:

```
PLATFORM=$(dpkg --print-architecture)
wget -q https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${PLATFORM} && sudo mv yq_linux_${PLATFORM} /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
```

5. Install essentials build packages

```
Expand Down Expand Up @@ -75,8 +84,8 @@ cd start-os/backend/
Clone the project locally. Note the submodule link to the original project(s).

```
git clone https://github.com/Start9Labs/jam-wrapper.git
cd jam-wrapper
git clone https://github.com/Start9Labs/jam-startos
cd jam-startos
git submodule update --init --recursive
```

Expand Down
7 changes: 4 additions & 3 deletions instructions.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
## Usage Instructions

1. Open JAM by pressing the `LAUNCH UI` button.
2. For the first time using JAM, you will need to setup your wallet credentials. You can set up as many JAM wallets as you like.
3. Please visit the [JAM Docs Website](https://jamdocs.org/) for detailed documentation on using JAM.
1. Start the JAM service and copy your username and password from Services > JAM > Properties
2. Open JAM by pressing the `LAUNCH UI` button, authenticating with your username and password.
3. For the first time using JAM, you will need to setup your wallet credentials. You can set up as many JAM wallets as you like.
4. Please visit the [JAM Docs Website](https://jamdocs.org/) for detailed documentation on using JAM.

For additional questions or support, please reach out [on telegram](https://t.me/JoinMarketWebUI).

Expand Down
11 changes: 5 additions & 6 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
id: jam
title: JAM
version: 0.1.6.1
version: 0.2.0
release-notes: |
* Update to latest upstream - [JAM v0.1.6 Release Notes](https://github.com/joinmarket-webui/jam/releases/tag/v0.1.6)
* Fix backup creation and restore processes.
* Add jmwalletd, obwatcher and the JAM container's Tor logs to the JAM service's logs
license: mit
* Update to latest jam-docker image upstream - [JAM v0.2.0 Release Notes](https://github.com/joinmarket-webui/jam/releases/tag/v0.1.6)
* JAM v0.2.0 updates to latest JoinMarket ([v0.9.11](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/release-notes/release-notes-0.9.11.md))
license: MIT
wrapper-repo: "https://github.com/Start9Labs/jam-wrapper"
upstream-repo: "https://github.com/joinmarket-webui/jam-docker"
support-site: "https://github.com/joinmarket-webui/jam-docker/issues"
Expand Down Expand Up @@ -73,7 +72,7 @@ interfaces:
- http
dependencies:
bitcoind:
version: ">=0.23.0.1 <=26.0.0"
version: ">=0.23.0.1 <=27.0.0"
requirement:
type: required
description: Used to subscribe to new block events from a full archival node.
Expand Down
Loading