Skip to content

Commit 504be15

Browse files
committed
Update release.yml
1 parent 59be59b commit 504be15

File tree

6 files changed

+65
-97
lines changed

6 files changed

+65
-97
lines changed

.github/actions/bump-manifest.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,25 @@ jobs:
2323
- name: Set env
2424
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
2525

26-
- uses: pnpm/[email protected]
26+
- uses: pnpm/[email protected]
2727
with:
2828
version: 8.6.1
29-
29+
3030
- name: Setup node
3131
uses: actions/setup-node@v2
3232
with:
33-
node-version: 16.x
33+
node-version: 22.x
3434
cache: 'pnpm'
35-
cache-dependency-path: 'web/pnpm-lock.yaml'
36-
37-
- name: Set env
38-
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
35+
cache-dependency-path: 'pnpm-lock.yaml'
3936

4037
- name: Install dependencies
4138
run: pnpm install
42-
working-directory: web
43-
44-
- name: Install package dependencies
45-
run: pnpm install
46-
working-directory: package
47-
48-
- name: Bump package version
49-
run: pnpm version ${{ github.ref_name }}
50-
working-directory: package
5139

5240
- name: Run build
5341
run: pnpm build
5442
env:
5543
CI: false
5644

57-
- name: Bump manifest version
58-
run: node .github/actions/bump-manifest.js
59-
env:
60-
TGT_RELEASE_VERSION: ${{ github.ref_name }}
61-
62-
- name: Push manifest change
63-
uses: EndBug/add-and-commit@v8
64-
with:
65-
add: fxmanifest.lua
66-
push: true
67-
author_name: Manifest Bumper
68-
author_email: 41898282+github-actions[bot]@users.noreply.github.com
69-
message: 'chore: bump manifest version to ${{ github.ref_name }}'
70-
7145
- name: Update tag ref
7246
uses: EndBug/latest-tag@latest
7347
with:
@@ -77,7 +51,7 @@ jobs:
7751
run: |
7852
mkdir -p ./temp/sync_reports/dist
7953
cp ./{dist/client.js,dist/server.js} ./temp/sync_reports/dist
80-
cp ./{README.md,LICENSE,fxmanifest.lua, sql/install.sql} ./temp/sync_reports
54+
cp ./{README.md,LICENSE,fxmanifest.lua,sql/install.sql} ./temp/sync_reports
8155
cd ./temp && zip -r ../sync_reports.zip ./sync_reports
8256
8357
- name: Create Release
@@ -87,7 +61,7 @@ jobs:
8761
repo_token: '${{ secrets.GITHUB_TOKEN }}'
8862
title: '${{ env.RELEASE_VERSION }}'
8963
prerelease: false
90-
files: sync_armory.zip
64+
files: sync_reports.zip
9165

9266
env:
9367
CI: false

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules
22
/dist
3-
/fxmanifest.lua
43
/.yarn.installed
54
.DS_Store

package.json

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
1-
{
2-
"name": "sync_report",
3-
"author": "unitysync",
4-
"version": "1.0.0",
5-
"license": "",
6-
"description": "",
7-
"type": "module",
8-
"scripts": {
9-
"web:dev": "cd web && vite dev",
10-
"build": "node scripts/build.js",
11-
"watch": "node scripts/build.js --watch",
12-
"prettier": "prettier ./{src,web}/**/*.{ts,tsx} --write",
13-
"eslint": "eslint ./{src,web}/**/*.{ts,tsx}"
14-
},
15-
"keywords": [
16-
"fivem"
17-
],
18-
"repository": {
19-
"type": "git",
20-
"url": "https://github.com/overextended/fivem-typescript-boilerplate.git"
21-
},
22-
"bugs": "https://github.com/overextended/fivem-typescript-boilerplate/issues",
23-
"devDependencies": {
24-
"@citizenfx/client": "latest",
25-
"@citizenfx/server": "latest",
26-
"@eslint/js": "^9.13.0",
27-
"@overextended/fx-utils": "^0.0.4",
28-
"@types/eslint__js": "^8.42.3",
29-
"@types/node": "^20.17.5",
30-
"@types/react": "^18.3.12",
31-
"@types/react-dom": "^18.3.1",
32-
"@typescript-eslint/eslint-plugin": "^8.12.2",
33-
"@typescript-eslint/parser": "^8.12.2",
34-
"@vitejs/plugin-react": "^4.3.3",
35-
"esbuild": "^0.23.1",
36-
"eslint": "^9.13.0",
37-
"eslint-plugin-react-hooks": "^4.6.2",
38-
"eslint-plugin-react-refresh": "^0.4.14",
39-
"prettier": "^3.3.3",
40-
"typescript": "^5.6.3",
41-
"typescript-eslint": "^8.12.2",
42-
"vite": "^5.4.10"
43-
},
44-
"dependencies": {
45-
"@jgoz/esbuild-plugin-typecheck": "^4.0.2",
46-
"@nativewrappers/fivem": "latest",
47-
"@overextended/ox_lib": "latest",
48-
"@overextended/oxmysql": "^1.3.0",
49-
"react": "^18.3.1",
50-
"react-dom": "^18.3.1"
51-
}
52-
}
1+
{
2+
"name": "sync_reports",
3+
"author": "unitysync",
4+
"version": "1.0.0",
5+
"license": "LGPL-3.0-or-later",
6+
"description": "",
7+
"type": "module",
8+
"scripts": {
9+
"web:dev": "cd web && vite dev",
10+
"build": "node scripts/build.js",
11+
"watch": "node scripts/build.js --watch",
12+
"prettier": "prettier ./{src,web}/**/*.{ts,tsx} --write",
13+
"eslint": "eslint ./{src,web}/**/*.{ts,tsx}"
14+
},
15+
"keywords": [
16+
"fivem"
17+
],
18+
"repository": {
19+
"type": "git",
20+
"url": "https://github.com/unitysync/sync_reports.git"
21+
},
22+
"devDependencies": {
23+
"@citizenfx/client": "latest",
24+
"@citizenfx/server": "latest",
25+
"@eslint/js": "^9.13.0",
26+
"@overextended/fx-utils": "^0.0.4",
27+
"@types/eslint__js": "^8.42.3",
28+
"@types/node": "^20.17.5",
29+
"@types/react": "^18.3.12",
30+
"@types/react-dom": "^18.3.1",
31+
"@typescript-eslint/eslint-plugin": "^8.12.2",
32+
"@typescript-eslint/parser": "^8.12.2",
33+
"@vitejs/plugin-react": "^4.3.3",
34+
"esbuild": "^0.23.1",
35+
"eslint": "^9.13.0",
36+
"eslint-plugin-react-hooks": "^4.6.2",
37+
"eslint-plugin-react-refresh": "^0.4.14",
38+
"prettier": "^3.3.3",
39+
"typescript": "^5.6.3",
40+
"typescript-eslint": "^8.12.2",
41+
"vite": "^5.4.10"
42+
},
43+
"dependencies": {
44+
"@jgoz/esbuild-plugin-typecheck": "^4.0.2",
45+
"@nativewrappers/fivem": "latest",
46+
"@overextended/ox_lib": "latest",
47+
"@overextended/oxmysql": "^1.3.0",
48+
"react": "^18.3.1",
49+
"react-dom": "^18.3.1"
50+
}
51+
}

src/client/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"types": [
44
"@citizenfx/client",
55
"@nativewrappers/fivem"
6-
]
6+
],
7+
"lib": ["ES2022"],
8+
"moduleResolution": "bundler",
9+
"module": "es2022"
710
},
811
"include": [
912
"./"

src/server/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"types": [
44
"@types/node",
55
"@citizenfx/server"
6-
]
6+
],
7+
"lib": ["ES2022"],
8+
"moduleResolution": "bundler",
9+
"module": "es2022"
710
},
811
"include": [
912
"./"

0 commit comments

Comments
 (0)