Compare commits
13
Commits
11bf89c758
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
227b836e1a | ||
|
|
811652dd7b | ||
|
|
c00693e9c9 | ||
|
|
6adb0b6a8c | ||
|
|
c655aeca1f | ||
|
|
abc728ecc9 | ||
|
|
b494ee96ee | ||
|
|
d2c7871719 | ||
|
|
9d314f0f55 | ||
|
|
05bf17fc90 | ||
|
|
cb7d0da8a6 | ||
|
|
607d80bbf4 | ||
|
|
4f55dc864f |
No files matched your search
@@ -1,24 +1,17 @@
|
||||
name: dependabot-auto-merge
|
||||
name: Dependabot Auto-Merge
|
||||
on: pull_request
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- master
|
||||
|
||||
# Auto-merge Dependabot PRs with passing CI
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
dependabot:
|
||||
auto-merge:
|
||||
runs-on: ubuntu-latest
|
||||
# Only for Dependabot PRs
|
||||
if: github.actor == 'dependabot[bot]'
|
||||
steps:
|
||||
- name: Auto-merge
|
||||
run: gh pr merge --auto --merge "$PR_NUMBER"
|
||||
- name: Enable auto-merge for Dependabot PR
|
||||
run: gh pr merge --auto --merge "$PR_URL"
|
||||
env:
|
||||
PR_NUMBER: ${{ github.event.number }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PR_URL: ${{ github.event.pull_request.html_url }}
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -4,20 +4,7 @@ updates:
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
day: "monday"
|
||||
time: "05:00"
|
||||
timezone: "Asia/Makassar"
|
||||
open-pull-requests-limit: 10
|
||||
assignees:
|
||||
- "asepharyana"
|
||||
commit-message:
|
||||
prefix: "chore"
|
||||
prefix-development: "chore"
|
||||
include: "scope"
|
||||
reviewers:
|
||||
- "asepharyana"
|
||||
labels:
|
||||
- "dependencies"
|
||||
groups:
|
||||
production:
|
||||
dependency-type: "production"
|
||||
|
||||
@@ -29,7 +29,7 @@ jobs:
|
||||
|
||||
- uses: oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
bun-version: "1.4.0"
|
||||
|
||||
- name: Install deps (root workspace)
|
||||
run: bun install --frozen-lockfile
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "ZeaVis Edu API backend service",
|
||||
"scripts": {
|
||||
"dev": "bun --env-file=../../.env --watch src/index.ts",
|
||||
"start": "bun --env-file=../../.env src/index.ts",
|
||||
@@ -12,18 +13,18 @@
|
||||
"db:migrate": "drizzle-kit migrate"
|
||||
},
|
||||
"dependencies": {
|
||||
"@elysiajs/cors": "1.4.2",
|
||||
"@opentelemetry/api": "1.9.1",
|
||||
"@opentelemetry/exporter-prometheus": "0.221.0",
|
||||
"@opentelemetry/instrumentation-http": "0.221.0",
|
||||
"@opentelemetry/sdk-node": "0.221.0",
|
||||
"@opentelemetry/semantic-conventions": "1.43.0",
|
||||
"@elysiajs/cors": "^1.4.2",
|
||||
"@opentelemetry/api": "^1.9.1",
|
||||
"@opentelemetry/exporter-prometheus": "^0.222.0",
|
||||
"@opentelemetry/instrumentation-http": "^0.222.0",
|
||||
"@opentelemetry/sdk-node": "^0.222.0",
|
||||
"@opentelemetry/semantic-conventions": "^1.43.0",
|
||||
"@zeavis/shared": "workspace:*",
|
||||
"bcryptjs": "^3.0.3",
|
||||
"drizzle-orm": "^0.45.2",
|
||||
"elysia": "^1.4.28",
|
||||
"postgres": "^3.4.9",
|
||||
"prom-client": "15.1.3"
|
||||
"prom-client": "^15.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bcryptjs": "^3.0.0",
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "ZeaVis Edu Tauri desktop and mobile application",
|
||||
"scripts": {
|
||||
"dev": "tauri dev",
|
||||
"build": "tauri build",
|
||||
@@ -14,6 +15,6 @@
|
||||
"@tauri-apps/cli": "^2"
|
||||
},
|
||||
"dependencies": {
|
||||
"sharp": "0.35.3"
|
||||
"sharp": "^0.35.4"
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "ZeaVis Edu web application frontend",
|
||||
"scripts": {
|
||||
"dev": "vite --host 0.0.0.0",
|
||||
"build": "tsc --project tsconfig.json && vite build",
|
||||
@@ -22,10 +23,10 @@
|
||||
"react": "^19.2.6",
|
||||
"react-dom": "^19.2.6",
|
||||
"react-router-dom": "^7.15.1",
|
||||
"recharts": "3.10.1",
|
||||
"recharts": "^3.10.1",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.1",
|
||||
"web-vitals": "6.1.1",
|
||||
"web-vitals": "^6.2.1",
|
||||
"zustand": "^5.0.13"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -35,6 +36,6 @@
|
||||
"postcss": "^8.5.15",
|
||||
"typescript": "^7.0.2",
|
||||
"vite": "^8.0.14",
|
||||
"vite-tsconfig-paths": "6.1.1"
|
||||
"vite-tsconfig-paths": "^6.1.1"
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,20 @@
|
||||
outputs = { self, nixpkgs, flake-utils }:
|
||||
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
(self: super: {
|
||||
bun = super.bun.overrideAttrs (old: rec {
|
||||
version = "1.4.0";
|
||||
src = super.fetchzip {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip";
|
||||
sha256 = "sha256:Poy0vf7yJ/hzk33QiQj5gnshI5Q7dfbaMD7xgwiyDKw=";
|
||||
};
|
||||
});
|
||||
})
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
packages = {
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "2.11.1",
|
||||
"@tauri-apps/plugin-deep-link": "2.4.9",
|
||||
"@tauri-apps/plugin-opener": "2.5.4"
|
||||
"@tauri-apps/plugin-deep-link": "2.4.10",
|
||||
"@tauri-apps/plugin-opener": "2.5.5"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user