From 348670f7a63e4f3de09c0e534e4967cc4da1ee09 Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Sat, 13 Apr 2024 16:24:42 +0200 Subject: [PATCH 1/4] fix the unknow commit hash --- Dockerfile | 4 ++-- Makefile | 5 +++-- manifest.yaml | 1 + mutiny-web | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 968a986..6086aa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ ARG VITE_RGS ARG VITE_AUTH ARG VITE_STORAGE="/_services/vss/v2" ARG VITE_SELFHOSTED="true" -ARG VITE_COMMIT_HASH="unknown" +ARG VITE_COMMIT_HASH # Install dependencies RUN pnpm install --frozen-lockfile @@ -46,7 +46,7 @@ RUN pnpm install --frozen-lockfile # Build the static site RUN pnpm run build -FROM nginx:bookworm +FROM nginxproxy/docker-gen:0.12.0-debian RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends postgresql-15 && rm -rf /var/lib/apt/lists/* && mv /var/lib/postgresql/15/main /var/lib/ diff --git a/Makefile b/Makefile index 6ad0f48..192b0dc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PKG_ID := $(shell yq e ".id" manifest.yaml) PKG_VERSION := $(shell yq e ".version" manifest.yaml) TS_FILES := $(shell find ./ -name \*.ts) +COMMIT_HASH := $(shell cd mutiny-web && git rev-parse HEAD && cd ..) # delete the target of a rule if it has changed and its recipe exits with a nonzero exit status .DELETE_ON_ERROR: @@ -39,14 +40,14 @@ docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh ifeq ($(ARCH),x86_64) else mkdir -p docker-images - docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg ARCH=aarch64 --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar . + docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg VITE_COMMIT_HASH=$(COMMIT_HASH) --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar . endif docker-images/x86_64.tar: Dockerfile docker_entrypoint.sh ifeq ($(ARCH),aarch64) else mkdir -p docker-images - docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg ARCH=x86_64 --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar . + docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --build-arg VITE_COMMIT_HASH=$(COMMIT_HASH) --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar . endif $(PKG_ID).s9pk: manifest.yaml instructions.md icon.png LICENSE scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar diff --git a/manifest.yaml b/manifest.yaml index 223a12b..fd5077e 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -6,6 +6,7 @@ release-notes: | - Bug fixes - Improved performance - Update to fedimint v0.3.0 + - Display proper commit hash in settings license: MIT wrapper-repo: "https://github.com/benthecarman/mutiny-startos" upstream-repo: "https://github.com/MutinyWallet/mutiny-web" diff --git a/mutiny-web b/mutiny-web index 025f0d5..678516a 160000 --- a/mutiny-web +++ b/mutiny-web @@ -1 +1 @@ -Subproject commit 025f0d5f60b4e4df076ab2172d54befb517b736a +Subproject commit 678516a2bc1f66a1eaa3be38967be9da6d3eff4b From ac546ecc60ec162e84cd08da77c0854802c28764 Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Sat, 13 Apr 2024 16:30:50 +0200 Subject: [PATCH 2/4] Use v0.6.3 --- mutiny-web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mutiny-web b/mutiny-web index 678516a..025f0d5 160000 --- a/mutiny-web +++ b/mutiny-web @@ -1 +1 @@ -Subproject commit 678516a2bc1f66a1eaa3be38967be9da6d3eff4b +Subproject commit 025f0d5f60b4e4df076ab2172d54befb517b736a From ed463e1dc3b62c01d95fec0dd2a4af4bf888fe8f Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Sat, 13 Apr 2024 16:36:46 +0200 Subject: [PATCH 3/4] go back to nginx:bookworm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6086aa6..159b223 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN pnpm install --frozen-lockfile # Build the static site RUN pnpm run build -FROM nginxproxy/docker-gen:0.12.0-debian +FROM nginx:bookworm RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends postgresql-15 && rm -rf /var/lib/apt/lists/* && mv /var/lib/postgresql/15/main /var/lib/ From 681dcf820507de61d853bfe51bceafb982249f98 Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Sat, 13 Apr 2024 17:43:07 +0200 Subject: [PATCH 4/4] Update build and release workflows --- .github/workflows/buildService.yml | 7 +++-- .github/workflows/releaseService.yml | 43 +++++++++++++++++++++------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index c44bed7..f013351 100644 --- a/.github/workflows/buildService.yml +++ b/.github/workflows/buildService.yml @@ -20,16 +20,17 @@ jobs: 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.*) - mv ${PACKAGE_ID}*.s9pk ~/ + echo "::set-output name=package_id::$PACKAGE_ID" shell: bash - name: Upload .s9pk uses: actions/upload-artifact@v3 with: - name: ${{ env.PACKAGE_ID }}.s9pk - path: ~/*.s9pk + name: ${{ steps.build.outputs.package_id }}.s9pk + path: ./${{ steps.build.outputs.package_id }}.s9pk \ No newline at end of file diff --git a/.github/workflows/releaseService.yml b/.github/workflows/releaseService.yml index 40a7939..427d777 100644 --- a/.github/workflows/releaseService.yml +++ b/.github/workflows/releaseService.yml @@ -1,13 +1,12 @@ name: Release Service on: - workflow_dispatch: push: tags: - 'v*.*' jobs: - BuildPackage: + ReleasePackage: runs-on: ubuntu-latest permissions: contents: write @@ -24,27 +23,49 @@ jobs: 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: | - sha256sum mutiny-wallet.s9pk > mutiny-wallet.s9pk.sha256 + 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 e '.release-notes' manifest.yaml >> change-log.txt + yq -oy '.release-notes' manifest.* >> change-log.txt echo "## SHA256 Hash" >> change-log.txt echo '```' >> change-log.txt - sha256sum mutiny-wallet.s9pk >> change-log.txt + sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt echo '```' >> change-log.txt + shell: bash - - name: Create Release + - name: Create GitHub Release uses: softprops/action-gh-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref_name }} - name: Mutiny Wallet ${{ github.ref_name }} + name: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }} + prerelease: true body_path: change-log.txt files: | - mutiny-wallet.s9pk - mutiny-wallet.s9pk.sha256 + ./${{ 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