From c846751fd9832744b93f5ca65d96e219979962af Mon Sep 17 00:00:00 2001 From: Hatton Date: Mon, 10 Jun 2024 16:12:36 -0600 Subject: [PATCH 1/3] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b6c4006..841d26c0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "main": "dist/src/mainProcess/main.js", "name": "lameta", "productName": "lameta", - "version": "2.3.2-alpha", + "version": "2.3.3-alpha", "author": { "name": "lameta", "email": "sorryno@email.org" From ebc62b645b5a1e50eca016c49130a9e297852c18 Mon Sep 17 00:00:00 2001 From: Hatton Date: Mon, 10 Jun 2024 16:15:04 -0600 Subject: [PATCH 2/3] to 2.3.4-beta, don't release on push to master --- .github/workflows/main.yml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b6a32d7..04db3f88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,6 @@ on: push: branches: - V2 - - master - beta - release workflow_dispatch: diff --git a/package.json b/package.json index 841d26c0..166a0878 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "main": "dist/src/mainProcess/main.js", "name": "lameta", "productName": "lameta", - "version": "2.3.3-alpha", + "version": "2.3.4-beta", "author": { "name": "lameta", "email": "sorryno@email.org" From b4a74bf801c5e43222cf39d537477e48febc772b Mon Sep 17 00:00:00 2001 From: Hatton Date: Mon, 10 Jun 2024 16:40:20 -0600 Subject: [PATCH 3/3] Update readme --- .vscode/settings.json | 6 ++++-- README.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 210f38ae..c56cd845 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,13 +6,15 @@ "cSpell.words": [ "Dropzone", "ELAR", + "electron", "Heole", "Huli", - "Paradisec", - "Pardesic", "lameta", "lingmetax", "omitexport", + "Paradisec", + "Pardesic", + "playwright", "scripthost" ], "cSpell.diagnosticLevel": "Hint", diff --git a/README.md b/README.md index d63ba263..15e0afee 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,10 @@ then you need to do `yarn lingui-compile`. The current process, which I don't love, is this: 1. Change the version in `package.json` -2. Commit, push. A github action will build installers for Mac and Windows and create an unpublished "Release" on github. -3. Find that release, type in the description, and publish it. +2. Commit. +3. Add a tag matching that number, e.g. v2.3.4-beta +4. push the commit and tag. The GitHub Action in main.yml will run if you are on one of the branches listed there. It will build installers for Mac and Windows, get Apple to notarize the mac version, and create an unpublished "Release" on github. We do not currently have a way of "signing" the Windows version. +5. Find that release, type in the description, and publish it. ## License