Skip to content

Commit

Permalink
Merge branch 'master' into storage-next-device-selection
Browse files Browse the repository at this point in the history
  • Loading branch information
joseivanlopez committed Apr 3, 2024
2 parents cc317ea + e63f418 commit 2adc9bb
Show file tree
Hide file tree
Showing 29 changed files with 1,220 additions and 641 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/weblate-merge-po.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
if: steps.check_changes.outputs.po_updated == 'true'
working-directory: ./agama
run: |
web/share/update-manifest.py web/src/manifest.json
web/share/update-languages.py > web/src/languages.json
# use a unique branch to avoid possible conflicts with already existing branches
git checkout -b "po_merge_${GITHUB_RUN_ID}"
git commit -a -m "Update web PO files"$'\n\n'"Agama-weblate commit: `git -C ../agama-weblate rev-parse HEAD`"
Expand Down
Loading

0 comments on commit 2adc9bb

Please sign in to comment.