Skip to content

Commit

Permalink
Merge pull request #15 from remcoros/sparrow-1.9.1
Browse files Browse the repository at this point in the history
Sparrow 1.9.1
  • Loading branch information
remcoros authored May 15, 2024
2 parents 9703e4a + ec514e8 commit 272649f
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/buildService.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: Start9Labs/sdk@v1

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

- name: Build the service package
id: build
Expand All @@ -28,9 +28,9 @@ jobs:
PACKAGE_ID=$(yq -oy ".id" manifest.*)
echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
shell: bash
#

# - name: Upload .s9pk
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: ${{ env.package_id }}.s9pk
# path: ./${{ env.package_id }}.s9pk
4 changes: 2 additions & 2 deletions .github/workflows/releaseService.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: Start9Labs/sdk@v1

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

- name: Build the service package
run: |
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
shell: bash

- name: Create GitHub Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ github.ref_name }}
name: ${{ env.package_title }} ${{ github.ref_name }}
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-970af303-ls54 AS buildstage
FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-36987b11-ls57 AS buildstage

# these are specified in Makefile
ARG ARCH
Expand Down Expand Up @@ -26,6 +26,7 @@ RUN \
# dark theme
hsetroot \
gnome-themes-extra \
compton \
# desktop notifications
xfce4-notifyd \
libnotify-bin \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-970af303-ls54 AS buildstage
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-36987b11-ls57 AS buildstage

# these are specified in Makefile
ARG ARCH
Expand Down Expand Up @@ -26,6 +26,7 @@ RUN \
# dark theme
hsetroot \
gnome-themes-extra \
compton \
# desktop notifications
xfce4-notifyd \
libnotify-bin \
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPARROW_VERSION := 1.9.0
SPARROW_DEBVERSION := 1.9.0-1
SPARROW_VERSION := 1.9.1
SPARROW_DEBVERSION := 1.9.1-1
SPARROW_PGP_SIG := E94618334C674B40
# sha256 hashes can be found in https://github.com/mikefarah/yq/releases/download/v4.40.7/checksums-bsd
YQ_VERSION := 4.40.7
Expand All @@ -17,10 +17,12 @@ ASSET_FILES := $(shell find ./assets/compat)
all: verify

arm:
# this is not a typo, when building arm, remove the x86_64 image so it doesn't get packed by start-sdk
@rm -f docker-images/x86_64.tar
@ARCH=aarch64 $(MAKE)

x86:
# this is not a typo, when building x86, remove the aarch64 image so it doesn't get packed by start-sdk
@rm -f docker-images/aarch64.tar
@ARCH=x86_64 $(MAKE)

Expand Down
4 changes: 2 additions & 2 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id: sparrow-webtop
title: "Sparrow"
version: 1.9.0
version: 1.9.1
release-notes: |
* Update to Sparrow 1.9.0 - See [full changelog](https://github.com/sparrowwallet/sparrow/releases/tag/1.9.0)
* Update to Sparrow 1.9.1 - See [full changelog](https://github.com/sparrowwallet/sparrow/releases/tag/1.9.1)
license: GPLv3
wrapper-repo: "https://github.com/remcoros/sparrow-webtop-startos"
upstream-repo: "https://github.com/sparrowwallet/sparrow"
Expand Down
3 changes: 3 additions & 0 deletions root/defaults/autostart
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# run a compositor to get transparency effects
compton -cb

/opt/sparrow/bin/Sparrow
2 changes: 1 addition & 1 deletion scripts/procedures/migrations.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { compat, types as T } from "../deps.ts";

export const migration: T.ExpectedExports.migration = compat.migrations
.fromMapping({}, "1.9.0" );
.fromMapping({}, "1.9.1" );

0 comments on commit 272649f

Please sign in to comment.