Skip to content

Commit

Permalink
Merge pull request #1069 from clickvisual/feature/docker-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
kl7sn committed Oct 24, 2023
2 parents 7652267 + 3559811 commit 005087d
Show file tree
Hide file tree
Showing 7 changed files with 8,654 additions and 24 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: goreleaser

on:
push:
branches:
- 'feature/docker-ci'
tags:
- "v**"

jobs:
goreleaser:
runs-on: ubuntu-latest
Expand All @@ -25,10 +26,10 @@ jobs:
yarn install --frozen-lockfile
yarn run build
cp -rf dist ../api/internal/ui
- name: Set up Go 1.18
- name: Set up Go 1.21
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- uses: actions/cache@v2
with:
path: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ api/docs/index.html
ossutil64
ossutil64.1
obsutil_linux_amd64*/

api/docs/index.html
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ before:
- go mod download -x
builds:
- id: clickvisual
main: ./api
main: .
env:
- CGO_ENABLED=0
goos:
Expand Down
2 changes: 1 addition & 1 deletion api/internal/api/apiv2/base/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

// InstanceList godoc
// @Summary Gets all instance database and table data filtered by permissions
// @Summary Gets all instance database and table data filtered by permissions test
// @Description gets all instances, databases, and table nested data
// @Tags LOGSTORE
// @Produce json
Expand Down
25 changes: 7 additions & 18 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
{
"name": "clickvisual-website",
"name": "docs",
"version": "1.0.0",
"description": "clickvisual website",
"main": "index.js",
"license": "MIT",
"devDependencies": {
"vuepress": "^1.9.9"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"docs:dev": "vuepress dev docs",
"docs:build": "vuepress build docs"
},
"repository": {
"type": "git",
"url": "git@github.com:clickvisual/clickvisual.git"
},
"keywords": [],
"author": "",
"dependencies": {
"@vssue/api-github-v3": "^1.4.4",
"@vssue/vuepress-plugin-vssue": "^1.4.6",
"@vuepress/plugin-active-header-links": "^1.2.0",
"@vuepress/plugin-back-to-top": "^1.2.0",
"@vuepress/plugin-medium-zoom": "^1.2.0",
"@vuepress/plugin-nprogress": "^1.2.0",
"@vuepress/plugin-pwa": "^1.2.0",
"moment": "^2.24.0",
"vuepress": "^1.9.7"
"moment": "^2.29.4",
"url-loader": "^4.1.1"
}
}
8,638 changes: 8,638 additions & 0 deletions docs/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion egogen.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
output: api/docs
plugin: gin
dir: 'api'
dir: '.'

depends:
- gorm.io/plugin/soft_delete
Expand Down

0 comments on commit 005087d

Please sign in to comment.