Skip to content

Commit

Permalink
Merge branch 'master' into screenshot
Browse files Browse the repository at this point in the history
  • Loading branch information
OctoCPPlus authored Dec 14, 2024
2 parents ccf4d01 + f29ef8c commit e2f0e39
Show file tree
Hide file tree
Showing 4,154 changed files with 186,639 additions and 53,238 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 5 additions & 16 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,9 @@ rustflags = [
# We need to specify this flag for all targets because Clippy checks all of our code against all targets
# and our web code does not compile without this flag
"--cfg=web_sys_unstable_apis",

# CLIPPY LINT SETTINGS
# This is a workaround to configure lints for the entire workspace, pending the ability to configure this via TOML.
# See: https://github.com/rust-lang/cargo/issues/5034
# https://github.com/EmbarkStudios/rust-ecosystem/issues/22#issuecomment-947011395
# TODO: Move these to the root Cargo.toml once support is merged and stable
# See: https://github.com/rust-lang/cargo/pull/12148

# Clippy nightly often adds new/buggy lints that we want to ignore.
# Don't warn about these new lints on stable.
"-Arenamed_and_removed_lints",
"-Aunknown_lints",

# LONG-TERM: These lints are unhelpful.
"-Aclippy::manual_map", # Less readable: Suggests `opt.map(..)` instsead of `if let Some(opt) { .. }`
"-Aclippy::manual_range_contains", # Less readable: Suggests `(a..b).contains(n)` instead of `n >= a && n < b`
]

[target.x86_64-pc-windows-msvc]
# Use the LLD linker, it should be faster than the default.
# See: https://github.com/rust-lang/rust/issues/71520
linker = "rust-lld.exe"
4 changes: 4 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# TODO: Figure out why these specific tests are flaky on CI, fix them, then delete this file.
[[profile.ci.overrides]]
filter = "test(avm2/pixelbender_shaderdata) or test(avm2/graphics_round_rects)"
retries = 4
10 changes: 10 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# At the moment, we only use Docker to ease the perfect reproduction
# of the submitted Firefox extension for the AMO reviewers.
# These folders are not needed for that, but can get fairly large in
# a development repo, which makes building the Docker image harder.
.git
target
tests/tests/swf
**/node_modules
web/packages/*/dist
web/docker/docker_builds/*
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@
# Set *.as files as ActionScript, vs. GitHub's guess of AngelScript
*.as linguist-language=ActionScript

# Properly detect files as GLSL on Github
*.frag linguist-language=GLSL
*.vert linguist-language=GLSL

# Binary files
*.png binary
*.fla binary
*.swf binary
*.swc binary

# Fix GH saying Ruffle is written in ActionScript
tests/tests/swfs/** linguist-vendored
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ body:
description: |
Provide a clear and concise description of what the bug is.
- If there are steps to reproduce, list them here.
- If this is an issue with a specific SWF file, please provide a link to the SWF file, or you can attach the SWF by zipping it and dragging it onto the issue box.
- If this is a visual issue, please attach a screenshot of the problem.
validations:
required: true
Expand All @@ -30,6 +29,12 @@ body:
description: A clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
attributes:
label: Content Location
description: Where can we find the Flash content related to this issue? You can link to a webpage that has it, or you can attach the SWF by zipping it and dragging it onto the issue box.
validations:
required: true
- type: dropdown
attributes:
label: Affected platform
Expand Down
11 changes: 7 additions & 4 deletions .github/ISSUE_TEMPLATE/error_report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
---
name: Error report
title: "Error"
about:
labels: ["error-report"]
assignees: ""
about: "[DON'T CHOOSE THIS]: For auto-generated error reports"
title: Error
labels: error-report
assignees: ''

---


1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ https://github.com/ruffle-rs/ruffle/wiki/Frequently-Asked-Questions-For-Users

**Describe the feature**
Provide a clear and concise description of your feature request. Why would this feature be useful? Does the feature involve the desktop build, the web build, or both?

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Other
about: File an issue that does not fit elsewhere
title: ''
labels:
labels: ''
assignees: ''

---
Expand Down
53 changes: 53 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/web/"
versioning-strategy: increase
schedule:
interval: "weekly"
groups:
npm-minor:
patterns:
- "*"
update-types:
- "minor"
- "patch"
labels:
- "T-chore"
- "A-deps"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "T-chore"
- "A-deps"

- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
groups:
winit-wgpu-egui:
patterns:
- "winit"
- "wgpu"
- "naga"
- "egui*"
- "raw-window-handle"
wasm-bindgen:
patterns:
- "wasm-bindgen"
- "js-sys"
- "web-sys"
- "wasm-bindgen-futures"
cargo-minor:
patterns:
- "*"
update-types:
- "minor"
- "patch"
labels:
- "T-chore"
- "A-deps"
45 changes: 0 additions & 45 deletions .github/renovate.json5

This file was deleted.

82 changes: 70 additions & 12 deletions .github/workflows/download_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ name: Download translations from Crowdin
on:
schedule:
- cron: '0 21 * * *'
workflow_dispatch:

jobs:
crowdin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

if: github.repository == 'ruffle-rs/ruffle'

Expand All @@ -16,21 +17,78 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Crowdin push
uses: crowdin/github-action@v1
- name: Install dependencies
run: |
sudo apt-get install -y itstool gettext appstream
- name: Generate desktop & metainfo sources
working-directory: desktop/packages/linux
run: |
make update
# Crowdin action creates files and directories as root,
# however we need write access to them to apply changes,
# so just create them here instead of relying on Crowdin.
- name: Create locale directories
working-directory: desktop/packages/linux
run: |
mkdir -p locale/rs.ruffle.Ruffle.desktop
mkdir -p locale/rs.ruffle.Ruffle.metainfo.xml
- name: Crowdin download
uses: crowdin/github-action@v2
with:
config: 'crowdin.yml'
upload_sources: false
upload_translations: false
download_translations: true
localization_branch_name: l10n_crowdin_translations

create_pull_request: true
pull_request_title: 'chore: Update translations'
pull_request_body: 'New Crowdin pull request with translations'
pull_request_labels: 'localization'
pull_request_base_branch_name: 'master'
commit_message: 'chore: Update translations from Crowdin'
push_translations: false
create_pull_request: false
env:
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Apply desktop & metainfo sources
working-directory: desktop/packages/linux
run: |
make apply
- name: Upload intermediate files
uses: actions/upload-artifact@v4
with:
path: desktop/packages/linux/locale

- name: Commit
run: |
git config user.name "RuffleBuild"
git config user.email "[email protected]"
git checkout -b l10n_crowdin_translations
git add -A
git commit -m 'chore: Update translations from Crowdin'
- name: Push
uses: ad-m/github-push-action@master
with:
branch: l10n_crowdin_translations
github_token: ${{ secrets.RUFFLE_BUILD_TOKEN }}
force: true

- name: Create a PR
run: |
prs=$(gh pr list --base master --head l10n_crowdin_translations --limit 1 --json id | jq length)
if [ "$prs" = 1 ]; then echo "PR already exists"; exit 0; fi
pr_url=$(gh pr create \
--title 'chore: Update translations' \
--body 'New Crowdin pull request with translations 🎉' \
--head l10n_crowdin_translations \
--base master)
# This has to be done separately from creating a PR, because
# GitHub currently has issues with creating a PR with labels.
# Basically creating a PR works, adding labels works, but creating
# a PR with labels doesn't ¯\_(ツ)_/¯
gh pr edit "$pr_url" --add-label T-chore --add-label A-i18n
env:
# Use a custom token rather than the automatic GITHUB_TOKEN, as the automatic one doesn't allow created PRs to trigger workflows
# By using our own token (and thus own user), workflows will run, and the PR will be able to be merged.
GITHUB_TOKEN: ${{ secrets.RUFFLE_BUILD_TOKEN }}
Loading

0 comments on commit e2f0e39

Please sign in to comment.