Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
byawitz committed Apr 12, 2024
2 parents fca04f1 + 488336f commit 705f499
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 103 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: create release
run: gh release create ${{ github.ref_name }} -R ${{ github.repository }} -d -t "${{ github.ref_name }}" -n ""
run: gh release create ${{ github.ref_name }} -R ${{ github.repository }} -t "${{ github.ref_name }}" -n ""
- name: Set new version
run: |
VVER=${{ github.ref_name }}
Expand All @@ -82,4 +82,4 @@ jobs:
- uses: actions/setup-node@v4
- run: npx changelogithub
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN npm ci

RUN npm run build

FROM oven/bun:1.1.0-debian as backendBuild
FROM oven/bun:1.1.2-debian as backendBuild

RUN mkdir -p /tmp/backend

Expand All @@ -22,7 +22,7 @@ COPY apps/models /tmp/models

RUN bun install

FROM oven/bun:1.1.0-debian
FROM oven/bun:1.1.2-debian

RUN mkdir -p /usr/server/app

Expand Down
113 changes: 51 additions & 62 deletions apps/dashboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
"bootstrap": "5.3.2",
"litepicker": "^2.0.12",
"pinia": "^2.1.7",
"sass": "^1.71.1",
"sass": "^1.74.1",
"vue": "^3.4.15",
"vue-i18n": "^9.10.2",
"vue-router": "^4.2.5",
"vue-sweetalert2": "^5.0.5"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.9.0",
"@rushstack/eslint-patch": "^1.10.1",
"@tsconfig/node20": "^20.1.2",
"@types/jsdom": "^21.1.6",
"@types/node": "^20.11.10",
"@vitejs/plugin-vue": "^5.0.3",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/test-utils": "^2.4.4",
"@vue/test-utils": "^2.4.5",
"@vue/tsconfig": "^0.5.1",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.24.0",
Expand All @@ -44,6 +44,6 @@
"typescript": "~5.4.3",
"vite": "^5.2.7",
"vitest": "^1.4.0",
"vue-tsc": "^1.8.27"
"vue-tsc": "^2.0.11"
}
}
Loading

0 comments on commit 705f499

Please sign in to comment.