diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml index f013351..9ab20c4 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,12 @@ 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 + printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n" 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 427d777..18a80aa 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,19 +26,20 @@ 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 }} + printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n" 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 -oy '.release-notes' manifest.* >> change-log.txt echo "## SHA256 Hash" >> change-log.txt @@ -48,15 +49,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 +68,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 - fi + 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 852c527..6693ffe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM vaultwarden/server:1.32.1-alpine +FROM vaultwarden/server:1.32.2-alpine RUN apk update && \ apk add --no-cache \ diff --git a/Makefile b/Makefile index 23eca09..24c054d 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ else endif scripts/embassy.js: $(TS_FILES) scripts/generated/manifest.ts - deno bundle scripts/embassy.ts scripts/embassy.js + deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts scripts/generated/manifest.ts: manifest.json mkdir -p scripts/generated diff --git a/manifest.json b/manifest.json index 968d1f5..ebb2f66 100644 --- a/manifest.json +++ b/manifest.json @@ -1,14 +1,14 @@ { "id": "vaultwarden", "title": "Vaultwarden", - "version": "1.32.1", - "release-notes": "* Updated to the latest upstream code with notable changes:\n - Fixed syncing and login issues with native mobile clients\n* Full change log available [here](https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.1)", + "version": "1.32.2", + "release-notes": "* Updated to the latest upstream code with notable changes:\n - Fixed collection management for managers\n - Full change log available [here](https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.2)\n* Update bundling process to use Deno emit module\n* Switched the donation link to Librepay", "license": "AGPLv3", "wrapper-repo": "https://github.com/Start9Labs/vaultwarden-startos", "upstream-repo": "https://github.com/dani-garcia/vaultwarden", "support-site": "https://vaultwarden.discourse.group/", "marketing-site": "https://github.com/dani-garcia/vaultwarden/", - "donation-url": "https://www.paypal.com/paypalme/DaniGG", + "donation-url": "https://liberapay.com/dani-garcia", "build": ["make"], "description": { "short": "Secure password management", diff --git a/scripts/bundle.ts b/scripts/bundle.ts new file mode 100644 index 0000000..07cbf3a --- /dev/null +++ b/scripts/bundle.ts @@ -0,0 +1,6 @@ +// scripts/bundle.ts +import { bundle } from "https://deno.land/x/emit@0.40.0/mod.ts"; + +const result = await bundle("scripts/embassy.ts"); + +await Deno.writeTextFile("scripts/embassy.js", result.code); diff --git a/scripts/generators/generateManifest.ts b/scripts/generators/generateManifest.ts index 6d20252..221477a 100644 --- a/scripts/generators/generateManifest.ts +++ b/scripts/generators/generateManifest.ts @@ -1,4 +1,4 @@ -import inJson from '../../manifest.json' assert { type: "json" } +import inJson from '../../manifest.json' with { type: "json" }; await Deno.writeTextFile("scripts/generated/manifest.ts", ` /// GENERATED FILE diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts index da6ce09..946e9ff 100644 --- a/scripts/procedures/migrations.ts +++ b/scripts/procedures/migrations.ts @@ -3,7 +3,7 @@ import { manifest } from "../generated/manifest.ts"; export const migration: T.ExpectedExports.migration = migrations.fromMapping( { - // 1.32.1 No migration needed + // 1.32.2 No migration needed }, manifest.version, );