Skip to content

Commit

Permalink
chore: update infrastructure (#23)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Wang <i@ryanc.cc>
  • Loading branch information
ruibaby authored Jul 2, 2024
1 parent 6cd3e82 commit db027db
Show file tree
Hide file tree
Showing 7 changed files with 2,836 additions and 2,214 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CD

on:
release:
types:
- published

jobs:
cd:
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-cd.yaml@v1
secrets:
halo-username: ${{ secrets.HALO_USERNAME }}
halo-password: ${{ secrets.HALO_PASSWORD }}
permissions:
contents: write
with:
app-id: app-KfOps
ui-path: "console"
node-version: "20"
pnpm-version: "9"
17 changes: 17 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: CI

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
ci:
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v1
with:
ui-path: "console"
node-version: "20"
pnpm-version: "9"
138 changes: 0 additions & 138 deletions .github/workflows/workflow.yaml

This file was deleted.

25 changes: 20 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "com.github.node-gradle.node" version "5.0.0"
id "run.halo.plugin.devtools" version "0.0.5"
id "run.halo.plugin.devtools" version "0.0.9"
id "io.freefair.lombok" version "8.0.1"
id 'java'
}
Expand All @@ -14,7 +14,7 @@ repositories {
}

dependencies {
implementation platform('run.halo.tools.platform:plugin:2.8.0-SNAPSHOT')
implementation platform('run.halo.tools.platform:plugin:2.17.0-SNAPSHOT')
compileOnly 'run.halo.app:api'

testImplementation 'run.halo.app:api'
Expand All @@ -25,15 +25,30 @@ test {
useJUnitPlatform()
}

tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
}

node {
pnpmVersion = '8'
nodeProjectDir = file("${project.projectDir}/console")
}

task buildFrontend(type: PnpmTask) {
tasks.register('buildFrontend', PnpmTask) {
args = ['build']
dependsOn('installDepsForUI')
}

tasks.register('installDepsForUI', PnpmTask) {
args = ['install']
}

build {
tasks.getByName('compileJava').dependsOn('buildFrontend')
// build frontend before build
tasks.named('compileJava').configure {
dependsOn('buildFrontend')
}
}

halo {
version = "2.17"
}
35 changes: 18 additions & 17 deletions console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,35 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},
"dependencies": {
"@halo-dev/api-client": "^2.8.0",
"@halo-dev/components": "^1.7.0",
"@halo-dev/console-shared": "^2.8.0",
"axios": "^1.4.0",
"vue": "^3.3.4",
"vue-router": "^4.2.4"
"@halo-dev/api-client": "^2.17.0",
"@halo-dev/components": "^2.17.0",
"@halo-dev/console-shared": "^2.17.0",
"axios": "^1.7.2",
"vue": "^3.4.31",
"vue-router": "^4.4.0"
},
"devDependencies": {
"@iconify/json": "^2.2.104",
"@rushstack/eslint-patch": "^1.3.3",
"@tsconfig/node18": "^18.2.1",
"@halo-dev/ui-plugin-bundler-kit": "^2.17.0",
"@iconify/json": "^2.2.224",
"@rushstack/eslint-patch": "^1.10.3",
"@tsconfig/node18": "^18.2.4",
"@types/jsdom": "^16.2.15",
"@types/node": "^16.18.41",
"@vitejs/plugin-vue": "^4.3.3",
"@vue/compiler-sfc": "^3.3.4",
"@types/node": "^20.14.9",
"@vitejs/plugin-vue": "^5.0.5",
"@vue/compiler-sfc": "^3.4.31",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^10.0.0",
"@vue/test-utils": "^2.4.1",
"@vue/test-utils": "^2.4.6",
"@vue/tsconfig": "^0.4.0",
"eslint": "^8.47.0",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^8.7.1",
"jsdom": "^19.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"typescript": "~5.0.4",
"typescript": "~5.5.3",
"unplugin-icons": "^0.14.15",
"vite": "^4.4.9",
"vite": "^5.3.2",
"vitest": "^0.13.1",
"vue-tsc": "^1.8.8"
"vue-tsc": "^1.8.27"
}
}
Loading

0 comments on commit db027db

Please sign in to comment.