mirror of
https://github.com/beefproject/beef
synced 2026-06-08 13:15:56 +00:00
Merge branch 'master' into issue/3475-remove-ARE
This commit is contained in:
@@ -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']
|
||||
});
|
||||
@@ -3,7 +3,7 @@ name: 'BrowserStack Test'
|
||||
on:
|
||||
pull_request_target:
|
||||
branches: [ master ]
|
||||
types: [ labeled, opened, synchronize ]
|
||||
types: [ labeled ]
|
||||
|
||||
jobs:
|
||||
ubuntu-job:
|
||||
@@ -12,15 +12,12 @@ jobs:
|
||||
concurrency:
|
||||
group: browserstack-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: true
|
||||
if: |
|
||||
github.event.label.name == 'safe_to_test' ||
|
||||
github.event.pull_request.user.login == 'dependabot[bot]'
|
||||
if: github.event.label.name == 'safe_to_test'
|
||||
env:
|
||||
GITACTIONS: true
|
||||
steps:
|
||||
|
||||
- name: 'Remove safe_to_test label'
|
||||
if: github.event.label.name == 'safe_to_test'
|
||||
uses: actions/github-script@v8
|
||||
with:
|
||||
script: |
|
||||
@@ -79,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
|
||||
|
||||
@@ -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.1', require: false
|
||||
gem 'rubocop', '~> 1.86.0', require: false
|
||||
|
||||
# Geolocation support
|
||||
group :geoip do
|
||||
|
||||
+19
-24
@@ -1,13 +1,13 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activemodel (8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
activerecord (8.1.2)
|
||||
activemodel (= 8.1.2)
|
||||
activesupport (= 8.1.2)
|
||||
activemodel (8.1.2.1)
|
||||
activesupport (= 8.1.2.1)
|
||||
activerecord (8.1.2.1)
|
||||
activemodel (= 8.1.2.1)
|
||||
activesupport (= 8.1.2.1)
|
||||
timeout (>= 0.4.0)
|
||||
activesupport (8.1.2)
|
||||
activesupport (8.1.2.1)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.3.1)
|
||||
@@ -90,24 +90,20 @@ GEM
|
||||
prism (>= 1.3.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
json (2.19.1)
|
||||
json-schema (6.2.0)
|
||||
addressable (~> 2.8)
|
||||
bigdecimal (>= 3.1, < 5)
|
||||
json (2.19.2)
|
||||
language_server-protocol (3.17.0.5)
|
||||
lint_roller (1.1.0)
|
||||
logger (1.7.0)
|
||||
matrix (0.4.3)
|
||||
maxmind-db (1.4.0)
|
||||
mcp (0.8.0)
|
||||
json-schema (>= 4.1)
|
||||
method_source (1.1.0)
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2025.0902)
|
||||
mini_mime (1.1.5)
|
||||
minitest (6.0.1)
|
||||
minitest (6.0.2)
|
||||
drb (~> 2.0)
|
||||
prism (~> 1.5)
|
||||
mojo_magick (0.6.8)
|
||||
msfrpc-client (1.1.2)
|
||||
@@ -204,11 +200,10 @@ GEM
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-support (3.13.6)
|
||||
rubocop (1.85.1)
|
||||
rubocop (1.86.0)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
mcp (~> 0.6)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.3.0.2)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
@@ -246,14 +241,14 @@ GEM
|
||||
rack-session (>= 2.0.0, < 3)
|
||||
tilt (~> 2.0)
|
||||
slack-notifier (2.4.0)
|
||||
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)
|
||||
sqlite3 (2.9.2-aarch64-linux-gnu)
|
||||
sqlite3 (2.9.2-aarch64-linux-musl)
|
||||
sqlite3 (2.9.2-arm-linux-gnu)
|
||||
sqlite3 (2.9.2-arm-linux-musl)
|
||||
sqlite3 (2.9.2-arm64-darwin)
|
||||
sqlite3 (2.9.2-x86_64-darwin)
|
||||
sqlite3 (2.9.2-x86_64-linux-gnu)
|
||||
sqlite3 (2.9.2-x86_64-linux-musl)
|
||||
stringio (3.2.0)
|
||||
sync (0.5.0)
|
||||
term-ansicolor (1.11.3)
|
||||
@@ -345,7 +340,7 @@ DEPENDENCIES
|
||||
rdoc (~> 7.2)
|
||||
rest-client (~> 2.1.0)
|
||||
rspec (~> 3.13)
|
||||
rubocop (~> 1.85.1)
|
||||
rubocop (~> 1.86.0)
|
||||
rubyzip (~> 3.2)
|
||||
rushover (~> 0.3.0)
|
||||
selenium-webdriver (~> 4.41)
|
||||
|
||||
Generated
+4
-3
@@ -783,10 +783,11 @@
|
||||
}
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
|
||||
"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user