Skip to content

Commit

Permalink
Merge pull request #66 from Nek0-hinata/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Nek0-hinata authored Dec 18, 2023
2 parents 5affb86 + e81eed4 commit 86813d7
Show file tree
Hide file tree
Showing 7 changed files with 894 additions and 53 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/bump.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Bump & Release

on:
push:
branches:
- main

permissions:
contents: write

jobs:
bump-version-and-release:
name: Bump version & release
# if: github.event.base_ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2

- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'pnpm'

- name: Install dependencies
run: |
pnpm install
- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@v6.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
fetch_all_tags: true

- name: Build Changelog
id: github_release
uses: mikepenz/release-changelog-builder-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Build project
run: |
pnpm build
- name: Create Release
uses: softprops/action-gh-release@v1
with:
body: ${{steps.github_release.outputs.changelog}}
tag_name: ${{steps.tag_version.outputs.new_tag}}
files: ./dist
33 changes: 5 additions & 28 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy
name: Deploy Pages

on:
push:
Expand All @@ -13,28 +13,7 @@ permissions:

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: pnpm/action-setup@v2
with:
version: 8.10.5
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Lint
run: pnpm run lint

- name: Typecheck
run: pnpm run type-check
uses: ./.github/workflows/lint.yml

deploy:
needs: lint
Expand All @@ -45,14 +24,12 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v2
with:
version: 8.10.5

- uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: '.nvmrc'
cache: 'pnpm'

- name: Install dependencies
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/ci.yml → .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: CI
name: Lint Code

on:
push:
branches:
- main
- develop
workflow_call:

pull_request:
branches:
Expand All @@ -17,11 +14,9 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: pnpm/action-setup@v2
with:
version: 8.10.5

- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 0.0.0 (2023-11-23)


### Bug Fixes

* change renovate base branches ([d839d81](https://github.com/Nek0-hinata/knowledgeGraph/commit/d839d811147c7faf8f2ba41d66caa72c14b2e537))
* **deps:** pin dependencies ([766a368](https://github.com/Nek0-hinata/knowledgeGraph/commit/766a368a06358f01cc45805df4935eb9fc269f50))


### Features

* add `renovate.json` file ([08c7cce](https://github.com/Nek0-hinata/knowledgeGraph/commit/08c7cced6fb4ad49702442c6c697e12ec82f3ac0))
* add ci to auto lint when code push ([051521d](https://github.com/Nek0-hinata/knowledgeGraph/commit/051521d316d4aac3c68f0b269c3907e7b4b66f3d))
* add deploy workflows ([1d7add6](https://github.com/Nek0-hinata/knowledgeGraph/commit/1d7add6886e4736aeab518528fb8e9358f2a55a8))
* add husky and commitlint ([0144322](https://github.com/Nek0-hinata/knowledgeGraph/commit/01443227310aad425acc44b5813319d9ed2473f4))
* add prettier and eslint script ([a620ab2](https://github.com/Nek0-hinata/knowledgeGraph/commit/a620ab209fe031ed76ee507053232a8bad3eb7d9))
* adjust husky lint time ([35ff57a](https://github.com/Nek0-hinata/knowledgeGraph/commit/35ff57a6ba36372876691265a824e8e8f0eed6e3))
* enforce pnpm package manager ([7065601](https://github.com/Nek0-hinata/knowledgeGraph/commit/706560116f5a8af4387b6da6dea4eb0849f8a61c))
* init ([3b94e8b](https://github.com/Nek0-hinata/knowledgeGraph/commit/3b94e8b0c00d8f598669f4d9f96b24a5a20213e1))



23 changes: 20 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{
"name": "knowledgegraph",
"name": "project_s",
"packageManager": "pnpm@8.12.1",
"version": "0.0.0",
"private": true,
"engines": {
"node": ">=20.8.1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/Nek0-hinata/projectS.git"
},
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "vite",
"build": "run-p type-check \"build-only {@}\" --",
"preview": "vite preview",
"build-only": "vite build",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"version:patch": "./scripts/release.sh patch",
"version:minor": "./scripts/release.sh minor",
"version:major": "./scripts/release.sh major",
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
"lint": "pnpm run prettier:lint && pnpm run eslint:lint",
"lint:fix": "pnpm run eslint:fix && pnpm run prettier:fix",
Expand All @@ -31,12 +39,16 @@
"@commitlint/config-conventional": "18.4.3",
"@rushstack/eslint-patch": "1.6.1",
"@tsconfig/node18": "18.2.2",
"@types/node": "20.10.4",
"@types/node": "20.10.5",
"@vitejs/plugin-vue": "4.5.2",
"@vitejs/plugin-vue-jsx": "3.1.0",
"@vue/eslint-config-prettier": "8.0.0",
"@vue/eslint-config-typescript": "12.0.0",
"@vue/tsconfig": "0.5.0",
"@vue/tsconfig": "0.5.1",
"beachball": "2.39.0",
"commitizen": "4.3.0",
"conventional-changelog-cli": "4.1.0",
"cz-conventional-changelog": "3.3.0",
"eslint": "8.56.0",
"eslint-plugin-vue": "9.19.2",
"husky": "8.0.3",
Expand All @@ -45,5 +57,10 @@
"typescript": "5.3.3",
"vite": "5.0.10",
"vue-tsc": "1.8.25"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
}
}
Loading

0 comments on commit 86813d7

Please sign in to comment.