Skip to content

Commit

Permalink
Merge branch 'main' into xirvin
Browse files Browse the repository at this point in the history
  • Loading branch information
ImXirvin committed Aug 12, 2024
2 parents 9d7fc1d + 4b31ab7 commit 7511e22
Show file tree
Hide file tree
Showing 7 changed files with 991 additions and 22 deletions.
10 changes: 10 additions & 0 deletions .github/actions/bump-manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import fs from 'fs';

const version = process.env.TGT_RELEASE_VERSION
const newVersion = version.replace('v', '')

const manifestFile = fs.readFileSync('fxmanifest.lua', {encoding: 'utf8'})

const newFileContent = manifestFile.replace(/\bversion\s+(.*)$/gm, `version '${newVersion}'`)

fs.writeFileSync('fxmanifest.lua', newFileContent)
10 changes: 10 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Lint
on: [push, pull_request]
jobs:
lint:
name: Lint Resource
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Lint
uses: iLLeniumStudios/fivem-lua-lint-action@v2
79 changes: 79 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Build and Release

on:
push:
tags:
- 'v*.*.*' # This triggers the workflow on version tags

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Install archive tools
run: sudo apt install zip

- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: ${{ github.event.repository.default_branch }}

- uses: pnpm/[email protected]
with:
version: 8.6.1

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '21.x'
cache: 'pnpm'
cache-dependency-path: |
pnpm-lock.yaml
web/pnpm-lock.yaml
- name: Install script dependencies
run: pnpm install

- name: Install web dependencies
run: pnpm install
working-directory: web

- name: Build Script
run: pnpm run build

- name: Build Svelte project
run: pnpm run build
working-directory: web

- name: Bump manifest version
run: node .github/actions/bump-manifest.js
env:
TGT_RELEASE_VERSION: ${{ github.ref_name }}

- name: Push manifest change
uses: EndBug/add-and-commit@v8
with:
add: fxmanifest.lua
push: true
author_name: BL Development
message: 'chore: bump manifest version to ${{ github.ref_name }}'

- name: Bundle files
run: |
mkdir -p ./temp/bl_appearance
mkdir -p ./temp/bl_appearance/dist/
mkdir -p ./temp/bl_appearance/build/
cp ./{LICENSE,README.md,fxmanifest.lua,appearance.sql,Installation.md} ./temp/bl_appearance
cp -r ./{data,locale} ./temp/bl_appearance
cp -r ./build/* ./temp/bl_appearance/build/
cp -r ./dist/* ./temp/bl_appearance/dist/
cd ./temp && zip -r ../bl_appearance.zip ./bl_appearance
- name: Create Release
uses: 'marvinpinto/action-automatic-releases@latest'
with:
repo_token: '${{ secrets.GITHUB_TOKEN }}'
title: ${{ github.ref_name }}
prerelease: false
files: bl_appearance.zip
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
pnpm-lock.yaml
/build
/dist
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"fivemIgnore": true,
"main": "index.js",
"scripts": {
"build": "pnpm run init",
"build": "pnpm run init && pnpm run build-web",
"build-web": "cd ./web && pnpm run build",
"dev": "concurrently \"pnpm:init -dev\" \"pnpm:dev-web\" -c \"green.bold,cyan.bold\"",
"init": "rimraf ./dist && node ./src/build",
"dev-web": "cd ./web && pnpm run dev"
Expand Down
Loading

0 comments on commit 7511e22

Please sign in to comment.