🔄 synced local '.github/' with remote 'repo-template/.github/'

.github/actions/bump-manifest-version.js

@@ -1,11 +1,14 @@
-// Based off of https://github.com/overextended/ox_lib/blob/master/.github/actions/bump-manifest-version.js
 const fs = require('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}'`)
+let newFileContent = manifestFile.replace(/\bversion\s+(.*)$/gm, `version '${newVersion}'`)
+
+if (newFileContent == manifestFile) {
+    newFileContent = manifestFile.replace(/\bgame\s+(.*)$/gm, `game 'gta5'\nversion '${newVersion}'`);
+}
 
 fs.writeFileSync('fxmanifest.lua', newFileContent)

.github/contributing.md

@@ -104,7 +104,7 @@ Before creating enhancement suggestions, please check [this list](#before-submit
 
 * **Make sure it doesn't already exist.** Sounds silly, but there's a lot of features built in to Qbox that people don't realize so take a look through the docs and stuff to make sure it's not already there.
 * **Check if there's already PR which provides that enhancement.**
-* **Determine which resource the enhancement should be suggested in.** Whichever resource the suggestion is about, is where it should go. If the suggestion is about Qbox as a whole, make the suggestion in the qbx_core repository.
+* **Determine which resource the enhancement should be suggested in.** Whichever resource the suggestion is about, is where it should go. If the suggestion is about Qbox as a whole, make the suggestion in the qbx-core repository.
 * **Perform a [cursory search](https://github.com/search?q=is%3Aissue+user%3Aqbox-project++&type=issues&state=open)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 
 #### How Do I Submit A (Good) Enhancement Suggestion?

.github/workflows/release.yml

@@ -1,23 +1,18 @@
-# Based off of https://github.com/overextended/ox_lib/blob/master/.github/workflows/release.yml
-name: Release
+name: Create New Release
 
 on:
-  push:
-    tags:
-      - 'v*.*.*'
   workflow_dispatch:
-
+    inputs:
+      version:
+        required: true
 
 jobs:
   create-release:
-    name: Build and Create Tagged Release
+    name: Create New Release
     runs-on: ubuntu-latest
     steps:
-      - name: Install archive tools
-        run: sudo apt install zip
-
-      - name: Checkout source code
-        uses: actions/checkout@v2
+      - name: Checkout Repository
+        uses: actions/[email protected]
         with:
           fetch-depth: 0
           ref: ${{ github.event.repository.default_branch }}
@@ -27,44 +22,33 @@ jobs:
         with:
           node-version: 16.x
 
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Bump manifest version
         run: node .github/actions/bump-manifest-version.js
         env:
-          TGT_RELEASE_VERSION: ${{ github.ref_name }}
+          TGT_RELEASE_VERSION: ${{ inputs.version }}
 
       - name: Push manifest change
-        uses: EndBug/add-and-commit@v8
+        uses: EndBug/add-and-commit@latest
         with:
           add: fxmanifest.lua
           push: true
           author_name: Manifest Bumper
           author_email: 41898282+github-actions[bot]@users.noreply.github.com
-          message: 'chore: bump manifest version to ${{ github.ref_name }}'
-
-      - name: Update tag ref
-        uses: EndBug/latest-tag@latest
-        with:
-          tag-name: ${{ github.ref_name }}
+          message: 'chore: bump manifest version to ${{ inputs.version }}'
+
+      - name: Install ZIP
+        run: sudo apt install zip
 
       - name: Bundle files
         run: |
-          mkdir -p ./temp/qbx_diving
-          cp ./{LICENSE,README.md,fxmanifest.lua} ./temp/qbx_diving
-          cp -r ./{client,locales,server,config} ./temp/qbx_diving
-          cd ./temp && zip -r ../qbx_diving.zip ./qbx_diving
+          rm -rf ./.github ./.vscode ./.git
+          zip -r ./${{ github.event.repository.name }}.zip ./
 
       - name: Create Release
-        uses: 'marvinpinto/[email protected]'
-        id: auto_release
+        uses: 'marvinpinto/action-automatic-releases@latest'
         with:
+          title: ${{ inputs.version }}
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          title: ${{ env.RELEASE_VERSION }}
+          automatic_release_tag: ${{ inputs.version }}
           prerelease: false
-          files: qbx_diving.zip
-
-        env:
-          CI: false
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          files: ${{ github.event.repository.name }}.zip