Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tweak: messed with the pt locale #963

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .github/workflows/build-prerelease.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/build-prod.yml

This file was deleted.

31 changes: 15 additions & 16 deletions .github/workflows/locale-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,33 @@ jobs:
runs-on: ubuntu-latest
permissions:
pull-requests: write

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v3.8.1
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: 20

- name: Install dependencies
run: npm ci

- name: Label PR and enforce base branch
uses: actions/github-script@v6.4.1
uses: actions/github-script@v7
with:
script: |
console.warn('This is bugged and doesn\'t work, skip this step for now!');
process.exit(0);
// console.warn('This is bugged and doesn\'t work, skip this step for now!');
// process.exit(0);

// Add the 'translation' label
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['translation']
});

console.log(JSON.stringify(context.payload.pull_request));
const { repo, owner } = context.repo;
Expand All @@ -40,14 +49,6 @@ jobs:
pull_number
});

// Add the 'translation' label
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['translation']
})

// Check if the base branch is 'main' or 'master'
if (pull_request.data.base.ref === 'main' || pull_request.data.base.ref === 'master') {
// Change the base branch to 'develop'
Expand All @@ -58,8 +59,6 @@ jobs:
base: 'develop'
});
}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Run locale:check
id: locale-check
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/publish-tagged.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Publish Tagged Build

on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+*"

jobs:
build:
name: "Build Changelog & Release Prod"
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
attestations: write

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

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20

- name: Download all modules
run: npm ci

- name: Build project
run: |
npm run build
cat .github/.cienv >> $GITHUB_ENV

- name: Compress build output with zip
run: |
cd dist
zip -r ../monitor.zip .
cd ..
sha256sum monitor.zip

- name: Attest build provenance
id: attest_build_provenance
uses: actions/attest-build-provenance@v1
with:
subject-path: monitor.zip

- name: Create and Upload Release
uses: "marvinpinto/[email protected]"
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: ${{ env.TX_IS_PRERELEASE }}
files: monitor.zip
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ tmp_core_tsc/*
/start_*.bat
monitor-*.zip
bundle_size_report.html
.github/.cienv

# IDE Specific
.idea
Expand Down
13 changes: 13 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

# Rejects commits with the !NC flag is present in the changes
# The !NC flag is used to mark code that should not be commited to the repository
# It's useful to avoid commiting debug code, test code, etc.

# Check if the !NC flag is present in the changes
if git diff --staged --unified=0 --no-color | grep '^+' | grep -q '!NC'; then
echo -e "COMMIT REJECTED: Found the !NC flag in your changes.\nMake sure you didn't accidently staged something you shouldn't!"
exit 1
fi

exit 0
1 change: 0 additions & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"pidtree": "^0.6.0",
"pidusage": "^3.0.2",
"rotating-file-stream": "^3.2.1",
"semver": "^7.6.0",
"slash": "^5.1.0",
"slug": "^8.2.3",
"socket.io": "^4.7.5",
Expand Down
2 changes: 1 addition & 1 deletion fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
author 'Tabarra'
description 'The official FiveM/RedM server web/in-game management platform.'
repository 'https://github.com/tabarra/txAdmin'
version '7.2.2'
version 'REPLACE-VERSION'
ui_label 'txAdmin'

rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
Expand Down
2 changes: 1 addition & 1 deletion locale/pt.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$meta": {
"label": "Portuguese",
"label": "Portuguese1",
"humanizer_language": "pt"
},
"restarter": {
Expand Down
Loading