Skip to content

Commit

Permalink
fix: ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Murzbul committed Mar 14, 2023
1 parent 4243635 commit 98eb634
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 148 deletions.
7 changes: 6 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- run: echo "Running tests"
- run: npm install --force
- run: npm run ci
- run: npm run build
- run: npm run build-tsc
- run: npm run test-ci
- store_artifacts:
path: ~/circleci/coverage
Expand All @@ -20,3 +20,8 @@ workflows:
test_build:
jobs:
- test
filters:
branches:
only: master
tags:
only: /^\d+\.\d+\.\d+$/
23 changes: 0 additions & 23 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,3 @@ jobs:
with:
disable-changelog: true
node-module: true

# This workflow contains a single job called "build"
build:
name: Submodule update
runs-on: ubuntu-latest
steps:
##########################
# Checkout the code base #
##########################
- name: Checkout Code
uses: actions/checkout@v2

####################################
# Run the action against code base #
####################################
- name: run action
id: run_action
uses: fatjyc/[email protected]
with:
user: Murzbul
token: ${{ secrets.GH_TOKEN }}
repo: nexp-cli
repo_owner: DigiChanges
29 changes: 29 additions & 0 deletions .github/workflows/update-nexp-cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Update nexp-cli

on:
release:
types: [published]

jobs:
update-nexp-cli:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Clone nexp-cli repository
run: |
git clone --recurse-submodules https://Murzbul:${{env.GITHUB_TOKEN}}@github.com/DigiChanges/nexp-cli.git
cd nexp-cli
git config user.email "[email protected]"
git config user.name "GitHub Action"
- name: Update submodule
run: |
cd nexp-cli
git submodule update --remote --merge
git add .
git commit -m "feat: update nexp verion: ${{github.event.release.tag_name}}"
git push https://Murzbul:${{env.GITHUB_TOKEN}}@github.com/DigiChanges/nexp-cli.git HEAD:master
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ RUN chown node:node dist
# Run development server
ENTRYPOINT [ "dumb-init", "pnpm", "dev" ]

EXPOSE 8089
EXPOSE 9229

USER node

FROM dev as build
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "1.36.5",
"description": "",
"scripts": {
"add-type-compiler": "node_modules/.bin/deepkit-type-install",
"build": "etsc",
"build-tsc": "node rimraf_cpy.mjs && tsc -p tsconfig.json --incremental",
"ci": "npm run cpy-ci && npm run ts-check && npm run lint",
Expand All @@ -19,7 +20,7 @@
"lint": "eslint -c .eslintrc.json ./src",
"pre-commit": "lint-staged",
"pre-check": "pnpm ts-check && pnpm lint",
"prepare": "husky install",
"prepare": "pnpm add-type-compiler && husky install",
"start": "node dist/src/index.js",
"test-ci": "jest --run-in-band --coverage",
"test": "jest --coverage",
Expand All @@ -32,10 +33,10 @@
"author": "Digichanges",
"license": "MIT",
"dependencies": {
"@deepkit/core": "1.0.1-alpha.77",
"@deepkit/event": "1.0.1-alpha.85",
"@deepkit/core": "1.0.1-alpha.89",
"@deepkit/event": "1.0.1-alpha.91",
"@deepkit/injector": "1.0.1-alpha.91",
"@deepkit/type": "1.0.1-alpha.85",
"@deepkit/type": "1.0.1-alpha.91",
"@koa/cors": "^4.0.0",
"@koa/multer": "^3.0.0",
"@mikro-orm/core": "^5.6.14",
Expand Down Expand Up @@ -95,8 +96,8 @@
"devDependencies": {
"@commitlint/cli": "^17.4.4",
"@commitlint/config-conventional": "^17.4.4",
"@deepkit/type-compiler": "1.0.1-alpha.83",
"@shelf/jest-mongodb": "^4.1.4",
"@deepkit/type-compiler": "1.0.1-alpha.89",
"@shelf/jest-mongodb": "^4.1.7",
"@types/bcrypt": "^5.0.0",
"@types/compression": "^1.7.2",
"@types/config": "^0.0.41",
Expand Down
Loading

0 comments on commit 98eb634

Please sign in to comment.