From 46dbc894827118f4a8455c3943bc80e043de7834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= Date: Mon, 11 Sep 2023 03:04:19 +0200 Subject: [PATCH 1/5] Make edge builds fetch master builds from correct repository (#265) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we don't verify that the repository ID is what we expected then we will pull artifacts from PRs where the source branch is `master`. Signed-off-by: Johannes Löthberg --- docker/edge-alpine.Dockerfile | 2 +- docker/edge-ubuntu.Dockerfile | 2 +- upcoming-release-notes/265.md | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 upcoming-release-notes/265.md diff --git a/docker/edge-alpine.Dockerfile b/docker/edge-alpine.Dockerfile index 7e9d23643..35d53f334 100644 --- a/docker/edge-alpine.Dockerfile +++ b/docker/edge-alpine.Dockerfile @@ -8,7 +8,7 @@ RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --bu RUN mkdir /public ADD artifacts.json /tmp/artifacts.json -RUN jq -r '[.artifacts[] | select(.workflow_run.head_branch == "master")][0]' /tmp/artifacts.json > /tmp/latest-build.json +RUN jq -r '[.artifacts[] | select(.workflow_run.head_branch == "master" and .workflow_run.head_repository_id == .workflow_run.repository_id)][0]' /tmp/artifacts.json > /tmp/latest-build.json ARG GITHUB_TOKEN RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json) diff --git a/docker/edge-ubuntu.Dockerfile b/docker/edge-ubuntu.Dockerfile index cb8262caa..f8dfa113a 100644 --- a/docker/edge-ubuntu.Dockerfile +++ b/docker/edge-ubuntu.Dockerfile @@ -7,7 +7,7 @@ RUN yarn workspaces focus --all --production RUN mkdir /public ADD artifacts.json /tmp/artifacts.json -RUN jq -r '[.artifacts[] | select(.workflow_run.head_branch == "master")][0]' /tmp/artifacts.json > /tmp/latest-build.json +RUN jq -r '[.artifacts[] | select(.workflow_run.head_branch == "master" and .workflow_run.head_repository_id == .workflow_run.repository_id)][0]' /tmp/artifacts.json > /tmp/latest-build.json ARG GITHUB_TOKEN RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json) diff --git a/upcoming-release-notes/265.md b/upcoming-release-notes/265.md new file mode 100644 index 000000000..3dc5d3b3c --- /dev/null +++ b/upcoming-release-notes/265.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [kyrias] +--- + +Make edge builds fetch master builds from correct repository. From 9d6b9c556d2cb64a0c602b7df8359e9c97a08e80 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Wed, 4 Oct 2023 18:00:13 +0100 Subject: [PATCH 2/5] :bookmark: (23.10.0) (#269) * :bookmark: (23.10.0) * Remove used release notes * Upgrade web --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- package.json | 4 ++-- upcoming-release-notes/245.md | 7 ------- upcoming-release-notes/257.md | 6 ------ upcoming-release-notes/265.md | 6 ------ yarn.lock | 10 +++++----- 5 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 upcoming-release-notes/245.md delete mode 100644 upcoming-release-notes/257.md delete mode 100644 upcoming-release-notes/265.md diff --git a/package.json b/package.json index 17bb72800..6313eb359 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "actual-sync", - "version": "23.9.0", + "version": "23.10.0", "license": "MIT", "description": "actual syncing server", "type": "module", @@ -16,7 +16,7 @@ }, "dependencies": { "@actual-app/crdt": "2.1.0", - "@actual-app/web": "23.9.0", + "@actual-app/web": "23.10.0", "bcrypt": "^5.1.0", "better-sqlite3": "^8.2.0", "body-parser": "^1.20.1", diff --git a/upcoming-release-notes/245.md b/upcoming-release-notes/245.md deleted file mode 100644 index 396cea948..000000000 --- a/upcoming-release-notes/245.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -category: Features -authors: - - DistroByte ---- - -Make upload limits configurable via env vars to allow for larger files to be uploaded. diff --git a/upcoming-release-notes/257.md b/upcoming-release-notes/257.md deleted file mode 100644 index 34a788cf5..000000000 --- a/upcoming-release-notes/257.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -category: Enhancements -authors: [Aarup] ---- - -Add GoCardless integration for Spar Nord DK \ No newline at end of file diff --git a/upcoming-release-notes/265.md b/upcoming-release-notes/265.md deleted file mode 100644 index 3dc5d3b3c..000000000 --- a/upcoming-release-notes/265.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -category: Maintenance -authors: [kyrias] ---- - -Make edge builds fetch master builds from correct repository. diff --git a/yarn.lock b/yarn.lock index 79279936e..71e305185 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,10 +16,10 @@ __metadata: languageName: node linkType: hard -"@actual-app/web@npm:23.9.0": - version: 23.9.0 - resolution: "@actual-app/web@npm:23.9.0" - checksum: fc6bb319058323eb62b2a44a239fe825ca0b7eee9a69be7467ece391a2ca368d28e047aa8d9a60defb45dc9c9302ac307737c1d04d5ba25f430aedeecdf0744b +"@actual-app/web@npm:23.10.0": + version: 23.10.0 + resolution: "@actual-app/web@npm:23.10.0" + checksum: bcff1abea060b73bf5865d7ba5e08105500456c19cddbbd816cd1ad88be33448dc6699496d6dc2d742405bafd5e7846578a4420e3beec90a0de8c579edc8b700 languageName: node linkType: hard @@ -1565,7 +1565,7 @@ __metadata: resolution: "actual-sync@workspace:." dependencies: "@actual-app/crdt": 2.1.0 - "@actual-app/web": 23.9.0 + "@actual-app/web": 23.10.0 "@babel/preset-typescript": ^7.20.2 "@types/bcrypt": ^5.0.0 "@types/better-sqlite3": ^7.6.3 From fc643d28c64279c1ff8daf8793f8496abdf51a8d Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Thu, 5 Oct 2023 08:39:45 +0100 Subject: [PATCH 3/5] :arrow_up: upgrade better-sqlite3 to v8.6.0 (#268) * :arrow_up: upgrade better-sqlite3 to v8.6.0 * Release notes --- package.json | 4 ++-- upcoming-release-notes/268.md | 6 ++++++ yarn.lock | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 upcoming-release-notes/268.md diff --git a/package.json b/package.json index 6313eb359..4dcae841f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@actual-app/crdt": "2.1.0", "@actual-app/web": "23.10.0", "bcrypt": "^5.1.0", - "better-sqlite3": "^8.2.0", + "better-sqlite3": "^8.6.0", "body-parser": "^1.20.1", "cors": "^2.8.5", "date-fns": "^2.30.0", @@ -34,7 +34,7 @@ "devDependencies": { "@babel/preset-typescript": "^7.20.2", "@types/bcrypt": "^5.0.0", - "@types/better-sqlite3": "^7.6.3", + "@types/better-sqlite3": "^7.6.5", "@types/cors": "^2.8.13", "@types/express": "^4.17.17", "@types/express-actuator": "^1.8.0", diff --git a/upcoming-release-notes/268.md b/upcoming-release-notes/268.md new file mode 100644 index 000000000..0c2b484fb --- /dev/null +++ b/upcoming-release-notes/268.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Upgrade `better-sqlite3` to v8.6.0 to align with the version used in frontend diff --git a/yarn.lock b/yarn.lock index 71e305185..a882eeb07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1169,12 +1169,12 @@ __metadata: languageName: node linkType: hard -"@types/better-sqlite3@npm:^7.6.3": - version: 7.6.3 - resolution: "@types/better-sqlite3@npm:7.6.3" +"@types/better-sqlite3@npm:^7.6.5": + version: 7.6.5 + resolution: "@types/better-sqlite3@npm:7.6.5" dependencies: "@types/node": "*" - checksum: 37ffd2507beb55f284261fc72b2f0b5585aecd65ffaffbc1f48a4d59958c3bcc16e54b83d9fd6af5f6a0edab830e384aef7ed79dbbfc3d443f850cb1eab091f5 + checksum: 3999d79378b35f793b89d089b18866922dcc225a24c7218caf3d81ab0b3510cf2a9b88782c6aee8c9c98690e1c5fe72047752172bcb8db1361bb0eb0399ff59f languageName: node linkType: hard @@ -1568,7 +1568,7 @@ __metadata: "@actual-app/web": 23.10.0 "@babel/preset-typescript": ^7.20.2 "@types/bcrypt": ^5.0.0 - "@types/better-sqlite3": ^7.6.3 + "@types/better-sqlite3": ^7.6.5 "@types/cors": ^2.8.13 "@types/express": ^4.17.17 "@types/express-actuator": ^1.8.0 @@ -1579,7 +1579,7 @@ __metadata: "@typescript-eslint/eslint-plugin": ^5.51.0 "@typescript-eslint/parser": ^5.51.0 bcrypt: ^5.1.0 - better-sqlite3: ^8.2.0 + better-sqlite3: ^8.6.0 body-parser: ^1.20.1 cors: ^2.8.5 date-fns: ^2.30.0 @@ -1875,14 +1875,14 @@ __metadata: languageName: node linkType: hard -"better-sqlite3@npm:^8.2.0": - version: 8.2.0 - resolution: "better-sqlite3@npm:8.2.0" +"better-sqlite3@npm:^8.6.0": + version: 8.6.0 + resolution: "better-sqlite3@npm:8.6.0" dependencies: bindings: ^1.5.0 node-gyp: latest - prebuild-install: ^7.1.0 - checksum: ab8a00bcc33c4a7467f78fcbb103c784705cf170ecc9c8eb1149a89a2153c03a7f65681064667eb214fa7f555797abd8183380a0396ce04eaf36efef921ce103 + prebuild-install: ^7.1.1 + checksum: 9ebdfd675352347cda1ba30d620a3c512d9db827a1eba66460fd48203a7ad8138b0195893bbf47d40f704bcdd598710041271d4ed69779979b6f784c0d3579a1 languageName: node linkType: hard @@ -4986,7 +4986,7 @@ __metadata: languageName: node linkType: hard -"prebuild-install@npm:^7.1.0": +"prebuild-install@npm:^7.1.1": version: 7.1.1 resolution: "prebuild-install@npm:7.1.1" dependencies: From b8fbc9b19c9530c7521e385e0e29a8003a64d171 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Thu, 5 Oct 2023 08:40:00 +0100 Subject: [PATCH 4/5] :fire: remove jlongster/actual-server package (#260) * :fire: remove jlongster/actual-server package * Release notes --- .github/workflows/docker-edge.yml | 1 - .github/workflows/docker-release.yml | 3 +-- upcoming-release-notes/260.md | 6 ++++++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 upcoming-release-notes/260.md diff --git a/.github/workflows/docker-edge.yml b/.github/workflows/docker-edge.yml index 67de4b2f3..cff1747f0 100644 --- a/.github/workflows/docker-edge.yml +++ b/.github/workflows/docker-edge.yml @@ -23,7 +23,6 @@ env: IMAGES: | actualbudget/actual-server ghcr.io/actualbudget/actual-server - jlongster/actual-server # Creates the following tags: # - actual-server:edge diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 155961400..96d947f6a 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -13,7 +13,6 @@ env: IMAGES: | actualbudget/actual-server ghcr.io/actualbudget/actual-server - jlongster/actual-server # Creates the following tags: # - actual-server:latest (see docker/metadata-action flavor inputs, below) @@ -86,4 +85,4 @@ jobs: push: true file: docker/stable-alpine.Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 - tags: ${{ steps.alpine-meta.outputs.tags }} \ No newline at end of file + tags: ${{ steps.alpine-meta.outputs.tags }} diff --git a/upcoming-release-notes/260.md b/upcoming-release-notes/260.md new file mode 100644 index 000000000..490ed2d4f --- /dev/null +++ b/upcoming-release-notes/260.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Removing deprecated `jlongster/actual-server` From 75af7b99876474f9dad3674a385a6e42a3d4e948 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Thu, 5 Oct 2023 08:40:11 +0100 Subject: [PATCH 5/5] :wrench: (github) adding issue templates (#262) * :wrench: (github) adding issue templates * Release notes --- .github/ISSUE_TEMPLATE/bug-report.yml | 80 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 1 + .github/ISSUE_TEMPLATE/feature-request.yml | 11 +++ upcoming-release-notes/262.md | 6 ++ 4 files changed, 98 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml create mode 100644 upcoming-release-notes/262.md diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 000000000..254c18462 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,80 @@ +name: Bug Report +description: File a bug report also known as an issue or problem. +title: '[Bug]: ' +labels: ['bug'] +body: + - type: markdown + id: intro-md + attributes: + value: | + Thanks for taking the time to fill out this bug report! Please ensure you provide as much information as possible to better assist in confirming and identifying a fix for the bug. + - type: checkboxes + id: existing-issue + attributes: + label: 'Verified issue does not already exist?' + description: 'Please search to see if an issue already exists for the issue you encountered.' + options: + - label: 'I have searched and found no existing issue' + required: true + validations: + required: true + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? If you’re reporting an issue with imports, please attach a (redacted) version of the file you’re having trouble importing. You may need to zip it before uploading. + placeholder: Tell us what you see! + value: 'A bug happened!' + validations: + required: true + - type: textarea + id: errors-received + attributes: + label: 'What error did you receive?' + description: 'If you received an error or a message on the screen, please provide that here.' + validations: + required: false + - type: markdown + id: env-info + attributes: + value: '## Environment Details' + - type: dropdown + id: hosting + attributes: + label: Where are you hosting Actual? + description: Where are you running your instance of Actual from? + options: + - Locally via Yarn + - Docker + - Fly.io + - NAS + - Desktop App (Electron) + - Other + validations: + required: false + - type: dropdown + id: browsers + attributes: + label: What browsers are you seeing the problem on? + multiple: true + options: + - Firefox + - Chrome + - Safari + - Microsoft Edge + - Desktop App (Electron) + - Other + - type: dropdown + id: operating-system + attributes: + label: Operating System + description: What operating system are you using? + options: + - Windows 11 + - Windows 10 + - Mac OSX + - Linux + - Mobile Device + - Other + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..3ba13e0ce --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml new file mode 100644 index 000000000..bb918b9ab --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -0,0 +1,11 @@ +name: Feature request +description: Request a missing feature +title: '[Feature] ' +labels: ['feature'] +body: + - type: markdown + id: intro-md + attributes: + value: | + Please use the main Actual repository to make feature requests. This can be done here: + https://github.com/actualbudget/actual/issues/new/choose diff --git a/upcoming-release-notes/262.md b/upcoming-release-notes/262.md new file mode 100644 index 000000000..bd2f36238 --- /dev/null +++ b/upcoming-release-notes/262.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Add github issue templates