Merge branch 'master' into issue/2306-js-lint

This commit is contained in:
zinduolis
2026-03-11 19:50:06 +10:00
committed by GitHub
4 changed files with 71 additions and 25 deletions
@@ -0,0 +1,35 @@
name: 'Auto-label Dependabot PRs'
on:
pull_request_target:
branches: [ master ]
types: [ opened, synchronize ]
jobs:
auto-label:
name: 'Apply safe_to_test for Dependabot'
if: github.event.pull_request.user.login == 'dependabot[bot]'
runs-on: ubuntu-latest
steps:
- name: 'Add safe_to_test label'
uses: actions/github-script@v8
with:
script: |
const { owner, repo } = context.repo;
const issue_number = context.payload.pull_request.number;
// Remove first so re-adding always fires a labeled event,
// which triggers the BrowserStack workflow.
try {
await github.rest.issues.removeLabel({
owner, repo, issue_number,
name: 'safe_to_test'
});
} catch (e) {
if (e.status !== 404) throw e;
}
await github.rest.issues.addLabels({
owner, repo, issue_number,
labels: ['safe_to_test']
});
+18 -7
View File
@@ -9,6 +9,9 @@ jobs:
ubuntu-job:
name: 'BrowserStack Test on Ubuntu'
runs-on: ubuntu-latest
concurrency:
group: browserstack-${{ github.event.pull_request.number }}
cancel-in-progress: true
if: github.event.label.name == 'safe_to_test'
env:
GITACTIONS: true
@@ -18,12 +21,20 @@ jobs:
uses: actions/github-script@v8
with:
script: |
await github.rest.issues.removeLabel({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
name: 'safe_to_test'
});
try {
await github.rest.issues.removeLabel({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
name: 'safe_to_test'
});
} catch (e) {
if (e.status === 404) {
console.log('Label already removed, skipping');
} else {
throw e;
}
}
- name: 'BrowserStack Env Setup' # Invokes the setup-env action
uses: browserstack/github-actions/setup-env@master
@@ -65,4 +76,4 @@ jobs:
- name: 'BrowserStackLocal Stop' # Terminating the BrowserStackLocal tunnel connection
uses: browserstack/github-actions/setup-local@master
with:
local-testing: stop
local-testing: stop
+1 -1
View File
@@ -24,7 +24,7 @@ gem 'rake', '~> 13.3'
gem 'activerecord', '~> 8.1'
gem 'otr-activerecord', '~> 2.6.0'
gem 'sqlite3', '~> 2.9'
gem 'rubocop', '~> 1.85.0', require: false
gem 'rubocop', '~> 1.85.1', require: false
# Geolocation support
group :geoip do
+17 -17
View File
@@ -20,8 +20,8 @@ GEM
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.8.9)
public_suffix (>= 2.0.2, < 8.0)
ansi (1.5.0)
archive-zip (0.13.1)
io-like (~> 0.4.0)
@@ -90,8 +90,8 @@ GEM
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.18.1)
json-schema (6.1.0)
json (2.19.1)
json-schema (6.2.0)
addressable (~> 2.8)
bigdecimal (>= 3.1, < 5)
language_server-protocol (3.17.0.5)
@@ -99,7 +99,7 @@ GEM
logger (1.7.0)
matrix (0.4.3)
maxmind-db (1.4.0)
mcp (0.7.1)
mcp (0.8.0)
json-schema (>= 4.1)
method_source (1.1.0)
mime-types (3.7.0)
@@ -159,7 +159,7 @@ GEM
psych (5.3.1)
date
stringio
public_suffix (6.0.2)
public_suffix (7.0.5)
qr4r (0.6.2)
mojo_magick (~> 0.6.5)
rqrcode_core (~> 1.0)
@@ -204,7 +204,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.6)
rubocop (1.85.0)
rubocop (1.85.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -216,7 +216,7 @@ GEM
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.0)
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
ruby-progressbar (1.13.0)
@@ -246,14 +246,14 @@ GEM
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
slack-notifier (2.4.0)
sqlite3 (2.9.0-aarch64-linux-gnu)
sqlite3 (2.9.0-aarch64-linux-musl)
sqlite3 (2.9.0-arm-linux-gnu)
sqlite3 (2.9.0-arm-linux-musl)
sqlite3 (2.9.0-arm64-darwin)
sqlite3 (2.9.0-x86_64-darwin)
sqlite3 (2.9.0-x86_64-linux-gnu)
sqlite3 (2.9.0-x86_64-linux-musl)
sqlite3 (2.9.1-aarch64-linux-gnu)
sqlite3 (2.9.1-aarch64-linux-musl)
sqlite3 (2.9.1-arm-linux-gnu)
sqlite3 (2.9.1-arm-linux-musl)
sqlite3 (2.9.1-arm64-darwin)
sqlite3 (2.9.1-x86_64-darwin)
sqlite3 (2.9.1-x86_64-linux-gnu)
sqlite3 (2.9.1-x86_64-linux-musl)
stringio (3.2.0)
sync (0.5.0)
term-ansicolor (1.11.3)
@@ -345,7 +345,7 @@ DEPENDENCIES
rdoc (~> 7.2)
rest-client (~> 2.1.0)
rspec (~> 3.13)
rubocop (~> 1.85.0)
rubocop (~> 1.85.1)
rubyzip (~> 3.2)
rushover (~> 0.3.0)
selenium-webdriver (~> 4.41)