Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
shigma committed Oct 1, 2020
2 parents ec3b26c + 2775284 commit 4ed7476
Show file tree
Hide file tree
Showing 36 changed files with 325 additions and 151 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Publish

on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'

jobs:
publish-dockerhub:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Docker buildx
uses: crazy-max/ghaction-docker-buildx@v3
- name: Docker Hub login
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
run: |
echo "${DOCKER_PASSWORD}" | docker login \
--username "${DOCKER_USERNAME}" \
--password-stdin
- name: Run buildx and push
env:
DOCKER_REPO: koishijs/koishi
run: |
docker buildx build \
--output "type=image,push=true" \
--platform linux/amd64,linux/arm/v7,linux/arm64 \
--tag ${DOCKER_REPO}:${GITHUB_REF#refs/tags/} \
--tag ${DOCKER_REPO}:latest \
./docker
- name: Docker Hub logout
if: always()
run: docker logout
17 changes: 7 additions & 10 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@ version: '2'

services:
cqhttp:
image: richardchien/cqhttp:latest
container_name: koishi_cqhttp
ports:
- 9000:9000 # VNC port
image: nanahira/go-cqhttp:latest
container_name: koishi-go-cqhttp
volumes:
- ./coolq:/home/user/coolq
- ./cqhttp:/data
environment:
VNC_PASSWD: MAX8char # change it
COOLQ_URL: http://dlsec.cqp.me/cqa-tuling # 'cqa-tuling' for CoolQ Air and 'cqp-tuling' for CoolQ Pro
CQHTTP_POST_URL: http://koishi:8080
CQHTTP_SERVE_DATA_FILES: "true"
UIN: myQQID # change it
PASS: myQQPassword # change it
HTTP_POST: http://koishi:8080

mysql:
image: mysql:5.7
container_name: koishi_mysql
container_name: koishi-mysql
volumes:
- ./mysql:/var/lib/mysql
environment:
Expand Down
6 changes: 3 additions & 3 deletions docker/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ const child_process = require('child_process')
const path = process.cwd() + '/koishi.config.js'
if (!fs.existsSync(path)) {
const config = {
type: 'http',
type: 'cqhttp:http',
port: 8080,
server: 'http://localhost:5700',
plugins: [
'common',
'schedule',
['common'],
['schedule'],
],
} // default config
const envNames = ['PORT', 'TYPE', 'SERVER']
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,48 +32,48 @@
"version": "1.0.0",
"license": "MIT",
"devDependencies": {
"@octokit/rest": "^18.0.5",
"@octokit/rest": "^18.0.6",
"@sinonjs/fake-timers": "^6.0.1",
"@types/chai": "^4.2.12",
"@types/chai-as-promised": "^7.1.3",
"@types/cross-spawn": "^6.0.2",
"@types/fs-extra": "^9.0.1",
"@types/mocha": "^8.0.3",
"@types/node": "^14.6.4",
"@types/semver": "^7.3.3",
"@types/sinonjs__fake-timers": "^6.0.1",
"@types/node": "^14.11.2",
"@types/semver": "^7.3.4",
"@types/sinonjs__fake-timers": "^6.0.2",
"@typescript-eslint/eslint-plugin": "^3.10.1",
"@typescript-eslint/parser": "^3.10.1",
"c8": "^7.3.0",
"c8": "^7.3.1",
"cac": "^6.6.1",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"cross-env": "^7.0.2",
"cross-spawn": "^7.0.3",
"del": "^5.1.0",
"eslint": "^7.8.1",
"del": "^6.0.0",
"eslint": "^7.10.0",
"eslint-config-standard": "^14.1.1",
"eslint-import-resolver-typescript": "^2.3.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-mocha": "^8.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"fs-extra": "^9.0.1",
"globby": "^11.0.1",
"jest-mock": "^26.3.0",
"kleur": "^4.1.1",
"kleur": "^4.1.3",
"latest-version": "^5.1.0",
"mocha": "^8.1.3",
"nock": "^13.0.4",
"open": "^7.2.1",
"open": "^7.3.0",
"ora": "^5.1.0",
"p-map": "^4.0.0",
"prompts": "^2.3.2",
"rimraf": "^3.0.2",
"semver": "^7.3.2",
"ts-node": "^9.0.0",
"tsconfig-paths": "^3.9.0",
"typescript": "^4.0.2"
"typescript": "^4.0.3"
}
}
8 changes: 4 additions & 4 deletions packages/adapter-cqhttp/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-adapter-cqhttp",
"description": "CQHTTP adapter for Koishi",
"version": "1.0.4",
"version": "1.0.5",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"files": [
Expand Down Expand Up @@ -31,13 +31,13 @@
"koishi"
],
"peerDependencies": {
"koishi-core": "^2.3.0"
"koishi-core": "^2.3.1"
},
"devDependencies": {
"@types/ms": "^0.7.31",
"@types/ws": "^7.2.6",
"@types/ws": "^7.2.7",
"get-port": "^5.1.1",
"koishi-test-utils": "^5.0.1"
"koishi-test-utils": "^5.0.2"
},
"dependencies": {
"axios": "^0.20.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapter-tomon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-adapter-tomon",
"description": "Tomon adapter for Koishi",
"version": "0.1.0",
"version": "0.1.1",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"files": [
Expand Down Expand Up @@ -29,10 +29,10 @@
"koishi"
],
"peerDependencies": {
"koishi-core": "^2.3.0"
"koishi-core": "^2.3.1"
},
"devDependencies": {
"koishi-test-utils": "^5.0.1"
"koishi-test-utils": "^5.0.2"
},
"dependencies": {
"koishi-utils": "^3.1.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/koishi-core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-core",
"description": "Core features for Koishi",
"version": "2.3.0",
"version": "2.3.1",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"engines": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"devDependencies": {
"@types/koa": "^2.11.4",
"@types/lru-cache": "^5.1.0",
"koishi-test-utils": "^5.0.1"
"koishi-test-utils": "^5.0.2"
},
"dependencies": {
"@types/koa-bodyparser": "^4.3.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/koishi-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-test-utils",
"description": "Test utilities for Koishi",
"version": "5.0.1",
"version": "5.0.2",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"engines": {
Expand Down Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"koishi-core": "^2.3.0",
"koishi-core": "^2.3.1",
"koishi-utils": "^3.1.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/koishi-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"devDependencies": {
"@types/supports-color": "^5.3.0",
"koishi-test-utils": "^5.0.1"
"koishi-test-utils": "^5.0.2"
},
"dependencies": {
"supports-color": "^7.2.0"
Expand Down
38 changes: 21 additions & 17 deletions packages/koishi/ecosystem.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,72 @@
{
"koishi-adapter-cqhttp": {
"version": "1.0.4",
"version": "1.0.5",
"description": "CQHTTP adapter for Koishi"
},
"koishi-adapter-tomon": {
"version": "0.1.0",
"version": "0.1.1",
"description": "Tomon adapter for Koishi"
},
"koishi-plugin-chess": {
"version": "2.0.0-beta.10",
"version": "2.0.0-beta.11",
"description": "Chess Plugin for Koishi"
},
"koishi-plugin-common": {
"version": "3.0.1",
"version": "3.0.2",
"description": "Common plugins for Koishi"
},
"koishi-plugin-dice": {
"version": "0.1.1",
"description": "COC / DND Tools for Koishi"
},
"koishi-plugin-eval": {
"version": "2.0.1",
"version": "2.0.2",
"description": "Execute JavaScript in Koishi"
},
"koishi-plugin-eval-addons": {
"version": "1.0.0-beta.11",
"version": "1.0.0-beta.12",
"description": "Execute JavaScript in Koishi"
},
"koishi-plugin-github": {
"version": "2.1.0",
"version": "2.1.1",
"description": "GitHub webhook plugin for Koishi"
},
"koishi-plugin-image-search": {
"version": "2.0.0",
"version": "2.0.1",
"description": "Image searching plugin for Koishi"
},
"koishi-plugin-mongo": {
"version": "1.0.3",
"version": "1.0.4",
"description": "MongoDB support for Koishi"
},
"koishi-plugin-monitor": {
"version": "1.0.0-beta.14"
"version": "1.0.0-beta.15"
},
"koishi-plugin-mysql": {
"version": "2.0.0",
"version": "2.0.1",
"description": "MySQL support for Koishi"
},
"koishi-plugin-puppeteer": {
"version": "1.0.0",
"version": "1.0.1",
"description": "Take Screenshots in Koishi"
},
"koishi-plugin-rss": {
"version": "1.0.0",
"version": "1.0.1",
"description": "Subscribe RSS Url for Koishi"
},
"koishi-plugin-schedule": {
"version": "2.0.2",
"version": "2.0.3",
"description": "Schedule plugin for Koishi"
},
"koishi-plugin-status": {
"version": "2.0.0-beta.15",
"version": "2.0.0-beta.16",
"description": "Show Status of Koishi"
},
"koishi-plugin-teach": {
"version": "1.1.0",
"version": "1.1.1",
"description": "Teach plugin for Koishi"
},
"koishi-plugin-tools": {
"version": "1.0.1"
"version": "1.0.2"
}
}
12 changes: 6 additions & 6 deletions packages/koishi/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi",
"description": "A QQ bot framework based on CQHTTP",
"version": "2.3.0",
"version": "2.3.1",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"engines": {
Expand Down Expand Up @@ -35,14 +35,14 @@
"koishi"
],
"devDependencies": {
"@types/prompts": "^2.0.8"
"@types/prompts": "^2.0.9"
},
"dependencies": {
"cac": "^6.6.1",
"kleur": "^4.1.1",
"koishi-adapter-cqhttp": "^1.0.4",
"koishi-core": "^2.3.0",
"koishi-plugin-common": "^3.0.1",
"kleur": "^4.1.3",
"koishi-adapter-cqhttp": "^1.0.5",
"koishi-core": "^2.3.1",
"koishi-plugin-common": "^3.0.2",
"prompts": "^2.3.2"
}
}
8 changes: 3 additions & 5 deletions packages/plugin-chess/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "koishi-plugin-chess",
"description": "Chess Plugin for Koishi",
"version": "2.0.0-beta.10",
"version": "2.0.0-beta.11",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"files": [
Expand Down Expand Up @@ -33,10 +33,8 @@
"game"
],
"peerDependencies": {
"koishi-core": "^2.3.0",
"koishi-plugin-puppeteer": "^1.0.0"
},
"dependencies": {
"koishi-core": "^2.3.1",
"koishi-plugin-puppeteer": "^1.0.1",
"koishi-utils": "^3.1.5"
}
}
Loading

0 comments on commit 4ed7476

Please sign in to comment.