Release 2024.4.1 (#28)

This commit is contained in:
Gregory Schier
2024-05-14 15:01:55 -07:00
committed by GitHub
parent 5dd9539ab3
commit ed371c8cb7
5 changed files with 14 additions and 13 deletions

View File

@@ -1,10 +1,8 @@
name: Generate Artifacts name: Generate Artifacts
on: on:
push: push:
tags: [ v* ] branches:
- release
permissions: write-all
jobs: jobs:
build-artifacts: build-artifacts:
permissions: permissions:
@@ -23,20 +21,17 @@ jobs:
- platform: 'windows-latest' - platform: 'windows-latest'
args: '' args: ''
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: setup node - name: setup node
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: lts/* node-version: lts/*
- name: install Rust stable - name: install Rust stable
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable
with: with:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
- name: install dependencies (ubuntu only) - name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above. if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
run: | run: |
@@ -44,13 +39,10 @@ jobs:
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
# webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
# You can remove the one that doesn't apply to your app to speed up the workflow a bit. # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
- name: Run tests - name: Run tests
run: npm test run: npm test
- uses: tauri-apps/tauri-action@v0 - uses: tauri-apps/tauri-action@v0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -43,6 +43,7 @@
"window:allow-is-fullscreen", "window:allow-is-fullscreen",
"window:allow-maximize", "window:allow-maximize",
"window:allow-minimize", "window:allow-minimize",
"window:allow-toggle-maximize",
"window:allow-set-decorations", "window:allow-set-decorations",
"window:allow-set-title", "window:allow-set-title",
"window:allow-start-dragging", "window:allow-start-dragging",

View File

@@ -1 +1 @@
{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["os:allow-os-type","event:allow-emit","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","event:allow-listen","event:allow-unlisten","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"protoc","sidecar":true}]},"window:allow-close","window:allow-is-fullscreen","window:allow-maximize","window:allow-minimize","window:allow-set-decorations","window:allow-set-title","window:allow-start-dragging","window:allow-unmaximize","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}} {"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["os:allow-os-type","event:allow-emit","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","event:allow-listen","event:allow-unlisten","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"protoc","sidecar":true}]},"window:allow-close","window:allow-is-fullscreen","window:allow-maximize","window:allow-minimize","window:allow-toggle-maximize","window:allow-set-decorations","window:allow-set-title","window:allow-start-dragging","window:allow-unmaximize","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}

View File

@@ -6,7 +6,7 @@
"frontendDist": "../dist" "frontendDist": "../dist"
}, },
"productName": "Yaak", "productName": "Yaak",
"version": "2024.4.0", "version": "2024.4.1",
"identifier": "app.yaak.desktop", "identifier": "app.yaak.desktop",
"app": { "app": {
"withGlobalTauri": false, "withGlobalTauri": false,

View File

@@ -21,12 +21,20 @@ export function twig(
const completions = twigCompletion({ options: variables }); const completions = twigCompletion({ options: variables });
const language = mixLanguage(base); const language = mixLanguage(base);
const completion = language.data.of({ autocomplete: completions });
const completionBase = base.language.data.of({ autocomplete: completions }); const completionBase = base.language.data.of({ autocomplete: completions });
const additionalCompletion = autocomplete const additionalCompletion = autocomplete
? [base.language.data.of({ autocomplete: genericCompletion(autocomplete) })] ? [base.language.data.of({ autocomplete: genericCompletion(autocomplete) })]
: []; : [];
return [language, completionBase, base.support, placeholders(variables), ...additionalCompletion]; return [
language,
completion,
completionBase,
base.support,
placeholders(variables),
...additionalCompletion,
];
} }
function mixLanguage(base: LanguageSupport): LRLanguage { function mixLanguage(base: LanguageSupport): LRLanguage {