diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index f013351..de30e20 100644 --- a/.github/workflows/buildService.yml +++ b/.github/workflows/buildService.yml @@ -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 @@ -26,11 +26,11 @@ jobs: start-sdk init make PACKAGE_ID=$(yq -oy ".id" manifest.*) - echo "::set-output name=package_id::$PACKAGE_ID" + echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV shell: bash - name: Upload .s9pk - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ steps.build.outputs.package_id }}.s9pk - path: ./${{ steps.build.outputs.package_id }}.s9pk \ No newline at end of file + name: ${{ env.package_id }}.s9pk + path: ./${{ env.package_id }}.s9pk \ No newline at end of file diff --git a/.github/workflows/releaseService.yml b/.github/workflows/releaseService.yml index ee85271..125d8c2 100644 --- a/.github/workflows/releaseService.yml +++ b/.github/workflows/releaseService.yml @@ -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: | @@ -26,21 +26,21 @@ jobs: - 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.*)" + echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV + echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV shell: bash - name: Generate sha256 checksum run: | - PACKAGE_ID=${{ steps.package.outputs.package_id }} + PACKAGE_ID=${{ env.package_id }} sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256 shell: bash - name: Generate changelog run: | - PACKAGE_ID=${{ steps.package.outputs.package_id }} + PACKAGE_ID=${{ env.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 ${PACKAGE_ID}.s9pk >> change-log.txt @@ -48,15 +48,15 @@ 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: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }} + name: ${{ env.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 + ./${{ env.package_id }}.s9pk + ./${{ env.package_id }}.s9pk.sha256 - name: Publish to Registry env: @@ -67,5 +67,5 @@ jobs: 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 + start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk fi \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 302b22e..b21564d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lnbits/lnbits:0.12.4 as builder +FROM lnbits/lnbits:0.12.5 as builder # arm64 or amd64 ARG PLATFORM @@ -6,7 +6,7 @@ ARG PLATFORM RUN apt-get update && apt-get install -y bash curl sqlite3 tini --no-install-recommends RUN curl -sS https://webi.sh/yq | sh -FROM lnbits/lnbits:0.12.4 as final +FROM lnbits/lnbits:0.12.5 as final COPY --from=builder /usr/bin/tini /usr/bin/tini COPY --from=builder /usr/bin/sqlite3 /usr/bin/sqlite3 diff --git a/manifest.yaml b/manifest.yaml index 4e4ede2..913783e 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,8 +1,8 @@ id: lnbits title: "LNBits" -version: 0.12.4 +version: 0.12.5 release-notes: | - * Update upstream to 0.12.4 - Full release notes available [here](https://github.com/lnbits/lnbits/releases/tag/0.12.4). + * Update LNbits to 0.12.5 - Full release notes available [here](https://github.com/lnbits/lnbits/releases/tag/0.12.5). license: MIT wrapper-repo: "https://github.com/Start9Labs/lnbits-startos" upstream-repo: "https://github.com/lnbits/lnbits" @@ -84,7 +84,7 @@ dependencies: how: Use the LND instance by default config: ~ c-lightning: - version: ">=0.10.1 <24.0.0" + version: ">=0.10.1 <25.0.0" description: Used to communicate with the Lightning Network. requirement: type: "opt-in" diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index b192471..3ed9a2a 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -19,5 +19,5 @@ export const migration: T.ExpectedExports.migration = compat.migrations ), }, }, -"0.12.4", +"0.12.5", );