Skip to content

Commit

Permalink
Merge branch 'master' into matiss/migrations
Browse files Browse the repository at this point in the history
  • Loading branch information
MatissJanis authored Oct 10, 2023
2 parents 4502f6c + 75af7b9 commit 89e46ca
Show file tree
Hide file tree
Showing 14 changed files with 134 additions and 39 deletions.
80 changes: 80 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .github/workflows/docker-edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ env:
IMAGES: |
actualbudget/actual-server
ghcr.io/actualbudget/actual-server
jlongster/actual-server
# Creates the following tags:
# - actual-server:edge
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 }}
tags: ${{ steps.alpine-meta.outputs.tags }}
2 changes: 1 addition & 1 deletion docker/edge-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker/edge-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "actual-sync",
"version": "23.9.0",
"version": "23.10.0",
"license": "MIT",
"description": "actual syncing server",
"type": "module",
Expand All @@ -16,9 +16,9 @@
},
"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",
"better-sqlite3": "^8.6.0",
"body-parser": "^1.20.1",
"cors": "^2.8.5",
"date-fns": "^2.30.0",
Expand All @@ -35,7 +35,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",
Expand Down
7 changes: 0 additions & 7 deletions upcoming-release-notes/245.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/257.md

This file was deleted.

6 changes: 6 additions & 0 deletions upcoming-release-notes/260.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MatissJanis]
---

Removing deprecated `jlongster/actual-server`
6 changes: 6 additions & 0 deletions upcoming-release-notes/262.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MatissJanis]
---

Add github issue templates
6 changes: 6 additions & 0 deletions upcoming-release-notes/268.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MatissJanis]
---

Upgrade `better-sqlite3` to v8.6.0 to align with the version used in frontend
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -1565,10 +1565,10 @@ __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
"@types/better-sqlite3": ^7.6.5
"@types/cors": ^2.8.13
"@types/express": ^4.17.17
"@types/express-actuator": ^1.8.0
Expand All @@ -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
Expand Down Expand Up @@ -1876,14 +1876,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

Expand Down Expand Up @@ -5049,7 +5049,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:
Expand Down

0 comments on commit 89e46ca

Please sign in to comment.