Skip to content

Commit

Permalink
Merge branch 'master' into bug-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DBFBlackbull committed Jan 22, 2024
2 parents 7db05a7 + 153db8c commit f97979f
Show file tree
Hide file tree
Showing 5,608 changed files with 757,162 additions and 321,063 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/charsheet-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fetch-depth: 0
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v11.5
uses: tj-actions/changed-files@v41
with:
since_last_remote_commit: true
separator: '::'
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/handle-sheet-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Processes and uploads sheet changes

on:
push:
branches:
- staging
- master

env:
NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

jobs:
deployment:
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/master'
environment: ${{ github.ref_name == 'master' && 'production' || 'staging' }}
runs-on: ubuntu-latest
env:
CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
# Set job outputs to values from filter step
outputs:
sheet: ${{ steps.filter.outputs.sheet }}
sheet-json: ${{ steps.filter.outputs.sheet_files }}
steps:
- uses: actions/checkout@v3
- uses: dorny/paths-filter@v2
id: filter
with:
# Enable listing of files matching each filter.
# Paths to files will be available in `${FILTER_NAME}_files` output variable.
# Paths will be escaped and space-delimited.
# Output is usable as command-line argument list in Linux shell
list-files: shell
filters: |
sheet:
- added|modified: '*/sheet.json'
- id: 'auth'
if: steps.filter.outputs.sheet == 'true'
uses: 'google-github-actions/auth@v1'
with:
credentials_json: '${{ secrets.SHEET_HTTP_GCP_KEYFILE }}'
- name: 'Set up Cloud SDK'
if: steps.filter.outputs.sheet == 'true'
uses: 'google-github-actions/setup-gcloud@v1'

- name: 'Use gcloud CLI'
if: steps.filter.outputs.sheet == 'true'
run: 'gcloud info'
- uses: oven-sh/setup-bun@v1
if: steps.filter.outputs.sheet == 'true'

- run: bun install
if: steps.filter.outputs.sheet == 'true'
working-directory: contrib/sheet-pixie

# Handles when sheets have been updated individually
- run: bun run contrib/sheet-pixie/index.ts ${{ steps.filter.outputs.sheet_files }}
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: find ${{ env.DEST_DIR }} -maxdepth 1 -type d -exec sh -c 'cp -R --verbose "$(basename "{}")/translations" "{}/"' 2>/dev/null \;
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }} gs://roll20-cdn/${{ env.CDN_SHEETS_FOLDER }} --cache-control='no-cache' --recursive
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
43 changes: 43 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Forces-updates all sheets

on:
push:
tags:
- 'v*'

env:
NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

jobs:
deployment:
environment: production
runs-on: ubuntu-latest
env:
CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
steps:
- uses: actions/checkout@v3

- id: 'auth'
uses: 'google-github-actions/auth@v1'
with:
credentials_json: '${{ secrets.SHEET_HTTP_GCP_KEYFILE }}'
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'

- name: 'Use gcloud CLI'
run: 'gcloud info'
- uses: oven-sh/setup-bun@v1

- run: bun install
working-directory: contrib/sheet-pixie

# Handles when a force-update has been requested (meaning all sheets will be re-built and deployed)
- run: make all
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: find ${{ env.DEST_DIR }} -maxdepth 1 -type d -exec sh -c 'cp -R --verbose "$(basename "{}")/translations" "{}/"' 2>/dev/null \;
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }} gs://roll20-cdn/${{ env.CDN_SHEETS_FOLDER }} --delete-unmatched-destination-objects --cache-control='no-cache' --recursive
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build/Release

# Dependency directories
node_modules/
!Shadowrun6th-German/node_modules
!Shadowrun6th-German/node_modules/jake/Makefile
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
Expand Down Expand Up @@ -84,7 +86,6 @@ out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
Expand Down Expand Up @@ -144,3 +145,9 @@ Icon
Network Trash Folder
Temporary Items
.apdisk

sync_sheets.sh

**/*/dist/*.html
**/*/dist/*.css
**/*/dist/*.json
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 18.17.0
36 changes: 18 additions & 18 deletions 13th Age Glorantha/translations/af.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Name": "Name",
"Name": "Investigateur",
"Race": "Race",
"Class": "Class",
"Class": "Class & Type",
"Level": "Level",
"AbilityScores": "AbilityScores",
"STR": "STR",
"STR": "FOR",
"Strength": "Strength",
"CON": "CON",
"Constitution": "Constitution",
Expand All @@ -18,19 +18,19 @@
"Charisma": "Charisma",
"Base": "Base",
"+Misc.": "+Misc.",
"+Item": "+Item",
"Mod": "Mod",
"+Item": "+Objet",
"Mod": "Mod.",
"Total": "Total",
"Basic Melee Attack": "Basic Melee Attack",
"Basic Ranged Attack": "Basic Ranged Attack",
"Defenses": "Defenses",
"Defenses": "Defense",
"Attack": "Attack",
"Damage": "Damage",
"Damage": "Dégâts :",
"Miss": "Miss",
"Ability": "Ability",
"Misc.": "Misc.",
"Weapon": "Weapon",
"Item": "Item",
"Weapon": "Weapon Name",
"Item": "Objet",
"On Miss": "On Miss",
"AC": "AC",
"PD": "PD",
Expand All @@ -42,8 +42,8 @@
"Damage on miss": "Damage on miss",
"Escalation die value": "Escalation die value",
"Attack result": "Attack result",
"Hit Points": "Hit Points",
"HP": "HP",
"Hit Points": "Points de vie/PV",
"HP": "PV",
"Recoveries": "Recoveries",
"Recovery": "Recovery",
"Recovery Value": "Recovery Value",
Expand All @@ -55,9 +55,9 @@
"One Unique Thing": "One Unique Thing",
"Describe your characters one unique thing ...": "Describe your characters one unique thing ...",
"Class Features": "Class Features",
"Talents": "Talents",
"Talents": "Talentos",
"Powers & Spells": "Powers & Spells",
"Feats": "Feats",
"Feats": "Feats from compendium",
"At-Will": "At-Will",
"Battle uses left": "Battle uses left",
"Daily uses left": "Daily uses left",
Expand All @@ -71,12 +71,12 @@
"positive": "positive",
"conflicted": "conflicted",
"negative": "negative",
"Background": "Background",
"Background": "Transfondo",
"Backgrounds": "Backgrounds",
"Roll": "Roll",
"Roll": "Rolls",
"Attribute": "Attribute",
"Check": "Check",
"Description": "Description",
"Description": "Description:",
"Macro": "Macro",
"Magic Items": "Magic Items",
"Equipment": "Equipment",
Expand All @@ -87,9 +87,9 @@
"abilities": "abilities",
"Extra Magic Item": "Extra Magic Item",
"Ability Score Bonus": "Ability Score Bonus",
"Skills": "Skills",
"Skills": "Compétences de l'Investigateur",
"Power/Spell": "Power/Spell",
"Feat": "Feat"
"Feat": "Virtue"
}


38 changes: 19 additions & 19 deletions 13th Age Glorantha/translations/cs.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"Name": "Jméno",
"Race": "Rasa",
"Class": "Class",
"Class": "Class & Type",
"Level": "Úroveň",
"AbilityScores": "AbilityScores",
"STR": "STR",
"STR": "SIL",
"Strength": "Síla",
"CON": "CON",
"CON": "ODOL",
"Constitution": "Odolnost",
"DEX": "DEX",
"DEX": "OBR",
"Dexterity": "Obratnost",
"INT": "INT",
"Intelligence": "Inteligence",
Expand All @@ -17,20 +17,20 @@
"CHA": "CHA",
"Charisma": "Charisma",
"Base": "Základní",
"+Misc.": "+Misc.",
"+Item": "+Item",
"Mod": "Mod",
"+Misc.": "+Jiné.",
"+Item": "+Objet",
"Mod": "Mod.",
"Total": "Celkem",
"Basic Melee Attack": "Basic Melee Attack",
"Basic Ranged Attack": "Basic Ranged Attack",
"Defenses": "Defenses",
"Defenses": "Defense",
"Attack": "Útok",
"Damage": "zranění",
"Miss": "Miss",
"Ability": "Vlastnost",
"Misc.": "Misc.",
"Weapon": "Weapon",
"Item": "Item",
"Misc.": "Jiné.",
"Weapon": "Weapon Name",
"Item": "Objet",
"On Miss": "On Miss",
"AC": "",
"PD": "PD",
Expand All @@ -42,22 +42,22 @@
"Damage on miss": "Damage on miss",
"Escalation die value": "Escalation die value",
"Attack result": "Attack result",
"Hit Points": "Hit Points",
"Hit Points": "Životy",
"HP": "HP",
"Recoveries": "Recoveries",
"Recovery": "Recovery",
"Recovery Value": "Recovery Value",
"Current": "Current",
"Current": "Aktuální",
"Max.": "Max.",
"Rec. Die": "Rec. Die",
"Temp.": "Temp.",
"Temp.": "Dočasné.",
"Initiative": "Iniciativa",
"One Unique Thing": "One Unique Thing",
"Describe your characters one unique thing ...": "Describe your characters one unique thing ...",
"Class Features": "Class Features",
"Talents": "Talents",
"Talents": "Talenty",
"Powers & Spells": "Powers & Spells",
"Feats": "Feats",
"Feats": "Feats from compendium",
"At-Will": "At-Will",
"Battle uses left": "Battle uses left",
"Daily uses left": "Daily uses left",
Expand All @@ -76,20 +76,20 @@
"Roll": "Hodit",
"Attribute": "Attribute",
"Check": "Kontrola",
"Description": "Description",
"Description": "Description:",
"Macro": "Macro",
"Magic Items": "Magic Items",
"Equipment": "Vybavení",
"Coins": "Coins",
"Qty": "Qty",
"Qty": "Množ.",
"Incremental Advances": "Incremental Advances",
"4th / 7th / 10th Level": "4th / 7th / 10th Level <br>(+1 to 3 abilities)",
"abilities": "abilities",
"Extra Magic Item": "Extra Magic Item",
"Ability Score Bonus": "Ability Score Bonus",
"Skills": "Dovednosti",
"Power/Spell": "Power/Spell",
"Feat": "Feat"
"Feat": "Virtue"
}


Loading

0 comments on commit f97979f

Please sign in to comment.