Compare commits
21 Commits
01de23a036
...
v0.2.9
| Author | SHA1 | Date | |
|---|---|---|---|
| 8eef4fc477 | |||
| 614867bd12 | |||
| cdf2bf5952 | |||
| a4bd6705b6 | |||
| 723048c72a | |||
| 06ea0cd488 | |||
| 007d3ddda7 | |||
| 33cdaebada | |||
| 9650ea63fc | |||
| db59b85bd2 | |||
| 3f6f3b739e | |||
| b33a896117 | |||
| 01ae1b5011 | |||
| 0ac69610f2 | |||
| c4489b58c9 | |||
| c19bef73e0 | |||
| c573d2277a | |||
| 3006a82a0f | |||
| a68aa78ae1 | |||
| ba9f51bd5e | |||
| 89a3eac2b9 |
@@ -1,13 +1,13 @@
|
|||||||
name: Deploy
|
name: Deploy
|
||||||
|
|
||||||
on:
|
# on:
|
||||||
push:
|
# push:
|
||||||
tags:
|
# tags:
|
||||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
# - "v[0-9]+.[0-9]+.[0-9]+"
|
||||||
|
|
||||||
paths:
|
# paths:
|
||||||
- ".gitea/workflows/deploy-client.yml"
|
# - ".gitea/workflows/deploy-client.yml"
|
||||||
- "client/**"
|
# - "client/**"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish-windows:
|
publish-windows:
|
||||||
@@ -36,14 +36,16 @@ jobs:
|
|||||||
--build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
--build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||||
|
|
||||||
docker create --name chad-client-windows-container chad-client-windows-builder
|
docker create --name chad-client-windows-container chad-client-windows-builder
|
||||||
docker cp chad-client-windows-container:/app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis ./nsis
|
mkdir -p artifacts
|
||||||
|
docker cp chad-client-windows-container:/artifacts artifacts/
|
||||||
docker rm chad-client-windows-container
|
docker rm chad-client-windows-container
|
||||||
|
ls -la artifacts
|
||||||
|
|
||||||
- name: Publish
|
- name: Publish
|
||||||
uses: akkuman/gitea-release-action@v1
|
uses: akkuman/gitea-release-action@v1
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
nsis/**
|
artifacts/**
|
||||||
draft: true
|
draft: true
|
||||||
|
|
||||||
# publish-web:
|
# publish-web:
|
||||||
|
|||||||
2
client/.gitattributes
vendored
Normal file
2
client/.gitattributes
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
/.yarn/releases/** binary
|
||||||
|
/.yarn/plugins/** binary
|
||||||
5
client/.gitignore
vendored
5
client/.gitignore
vendored
@@ -23,6 +23,7 @@ logs
|
|||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
|
|
||||||
|
.pnp.*
|
||||||
.yarn/*
|
.yarn/*
|
||||||
!.yarn/patches
|
!.yarn/patches
|
||||||
!.yarn/plugins
|
!.yarn/plugins
|
||||||
@@ -31,4 +32,6 @@ logs
|
|||||||
!.yarn/versions
|
!.yarn/versions
|
||||||
|
|
||||||
scripts/release.ps1
|
scripts/release.ps1
|
||||||
.tauri
|
.tauri
|
||||||
|
|
||||||
|
updater.json
|
||||||
|
|||||||
Binary file not shown.
942
client/.yarn/releases/yarn-4.12.0.cjs
vendored
Normal file
942
client/.yarn/releases/yarn-4.12.0.cjs
vendored
Normal file
File diff suppressed because one or more lines are too long
@@ -1 +1,3 @@
|
|||||||
nodeLinker: node-modules
|
nodeLinker: node-modules
|
||||||
|
|
||||||
|
yarnPath: .yarn/releases/yarn-4.12.0.cjs
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
FROM node:lts
|
# === Build ===
|
||||||
|
FROM node:lts AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN corepack enable yarn
|
# RUN corepack enable yarn && yarn set version stable
|
||||||
RUN yarn set version stable
|
|
||||||
|
|
||||||
COPY package.json yarn.lock .yarnrc.yml ./
|
COPY package.json yarn.lock .yarnrc.yml ./
|
||||||
|
COPY .yarn ./.yarn
|
||||||
|
|
||||||
RUN yarn install
|
RUN yarn install --immutable
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
ARG COMMIT_SHA=unknown
|
ARG COMMIT_SHA=unknown
|
||||||
@@ -19,11 +20,12 @@ ENV COMMIT_SHA=$COMMIT_SHA \
|
|||||||
TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \
|
TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \
|
||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD=
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD=
|
||||||
|
|
||||||
RUN apt update && apt install -y \
|
RUN apt update && apt install -y --no-install-recommends \
|
||||||
nsis \
|
nsis \
|
||||||
clang \
|
clang \
|
||||||
lld \
|
lld \
|
||||||
llvm
|
llvm \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||||
|
|
||||||
@@ -35,6 +37,12 @@ RUN cargo install --locked cargo-xwin
|
|||||||
|
|
||||||
RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
|
RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
|
||||||
|
|
||||||
RUN node scripts/generate-updater.js
|
RUN node scripts/generate-updater.mjs
|
||||||
|
|
||||||
RUN ls -la
|
# === Artifacts ===
|
||||||
|
FROM scratch AS artifacts
|
||||||
|
|
||||||
|
COPY --from=builder /app/updater.json ./artifacts
|
||||||
|
COPY --from=builder /app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/ ./artifacts
|
||||||
|
|
||||||
|
CMD ["true"]
|
||||||
|
|||||||
1
client/app/components.d.ts
vendored
1
client/app/components.d.ts
vendored
@@ -13,7 +13,6 @@ declare module 'vue' {
|
|||||||
PrimeButton: typeof import('primevue/button')['default']
|
PrimeButton: typeof import('primevue/button')['default']
|
||||||
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
|
PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
|
||||||
PrimeCard: typeof import('primevue/card')['default']
|
PrimeCard: typeof import('primevue/card')['default']
|
||||||
PrimeFieldset: typeof import('primevue/fieldset')['default']
|
|
||||||
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
|
PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
|
||||||
PrimeInputText: typeof import('primevue/inputtext')['default']
|
PrimeInputText: typeof import('primevue/inputtext')['default']
|
||||||
PrimeMenu: typeof import('primevue/menu')['default']
|
PrimeMenu: typeof import('primevue/menu')['default']
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="grid grid-cols-2 h-screen">
|
<div class="grid grid-cols-2 h-screen">
|
||||||
<div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
|
<div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
|
||||||
<AppHeader title="Сиськи отвалились">
|
<AppHeader title="Надарики">
|
||||||
<template #right>
|
<template #right>
|
||||||
<PrimeButtonGroup class="ml-auto">
|
<PrimeButtonGroup class="ml-auto">
|
||||||
<PrimeButton
|
<PrimeButton
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
export default defineNuxtRouteMiddleware(async (to, from) => {
|
export default defineNuxtRouteMiddleware(async (to, from) => {
|
||||||
if (import.meta.dev || import.meta.server)
|
// if (import.meta.dev || import.meta.server)
|
||||||
return
|
// return
|
||||||
|
|
||||||
const { isTauri } = useApp()
|
const { isTauri } = useApp()
|
||||||
|
|
||||||
if (!isTauri.value)
|
if (!isTauri.value)
|
||||||
return
|
return
|
||||||
|
|
||||||
if (from?.name)
|
if (from?.name || !!to.redirectedFrom)
|
||||||
return
|
return
|
||||||
|
|
||||||
const { checkForUpdates } = useUpdater()
|
const { checkForUpdates } = useUpdater()
|
||||||
@@ -15,6 +15,6 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
|
|||||||
const update = await checkForUpdates()
|
const update = await checkForUpdates()
|
||||||
|
|
||||||
if (update) {
|
if (update) {
|
||||||
return navigateTo({ name: 'Updating' })
|
return navigateTo({ name: 'Updater' })
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ definePageMeta({
|
|||||||
auth: false,
|
auth: false,
|
||||||
middleware: () => {
|
middleware: () => {
|
||||||
const { lastUpdate } = useUpdater()
|
const { lastUpdate } = useUpdater()
|
||||||
|
|
||||||
if (!lastUpdate.value)
|
if (!lastUpdate.value)
|
||||||
return navigateTo('/')
|
return navigateTo('/')
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"pub_date": "2025-10-19T23:31:56Z",
|
|
||||||
"version": "0.2.4",
|
|
||||||
"platforms": {
|
|
||||||
"windows-x86_64": {
|
|
||||||
"url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.4_x64-setup.exe",
|
|
||||||
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjA5ekxpMGNPQURBSWVYekdEb3kxZ2tKVUNyMVRmcG9vckpsT1Fhcm9PTFp4ZVdDdEtvdWVDYWY0bkJBWjZOby9QNkNNWFJUT1VBY0tRZVNXUVl6eVEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwOTE2NzE1CWZpbGU6Y2hhZF8wLjIuNF94NjQtc2V0dXAuZXhlCitPYjR2QjNxNk9HdjV1WmdnUFFWRWxraDJzUFZrd1p2bGwrcEpaWjEzZExaQUJvWWNjL1VWWFZlVG4yR2hIeDFSNzJTRk1MMDVtdGo4NGE0ckp0bERBPT0K"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notes": ""
|
|
||||||
}
|
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
"vue": "^3.5.22",
|
"vue": "^3.5.22",
|
||||||
"vue-router": "^4.5.1"
|
"vue-router": "^4.5.1"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@4.10.3",
|
"packageManager": "yarn@4.12.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
"@primevue/nuxt-module": "^4.4.0",
|
"@primevue/nuxt-module": "^4.4.0",
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ const BASE_URL = 'https://git.koptilnya.xyz/opti1337/chad/releases/download/late
|
|||||||
|
|
||||||
const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
|
const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
|
||||||
const tauriConf = JSON.parse(tauriConfRaw)
|
const tauriConf = JSON.parse(tauriConfRaw)
|
||||||
const version = tauriConf.package.version
|
const version = tauriConf.version
|
||||||
|
|
||||||
const SIG_FILE = path.resolve(
|
const SIG_FILE = path.resolve(
|
||||||
__dirname,
|
__dirname,
|
||||||
`../src-tauri/target/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
|
`../src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
|
||||||
)
|
)
|
||||||
|
|
||||||
const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()
|
const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "chad",
|
"productName": "chad",
|
||||||
"version": "0.2.6",
|
"version": "0.2.9",
|
||||||
"identifier": "xyz.koptilnya.chad",
|
"identifier": "xyz.koptilnya.chad",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../.output/public",
|
"frontendDist": "../.output/public",
|
||||||
|
|||||||
Reference in New Issue
Block a user