Skip to content

Commit 1af39b0

Browse files
committed
Merge remote-tracking branch 'origin/3.4.5' into 3.4.5
# Conflicts: # releases.properties
2 parents 1d41a5e + 9127930 commit 1af39b0

File tree

12 files changed

+5489
-10
lines changed

12 files changed

+5489
-10
lines changed

.github/.phpstorm-metadata/winbinder.php

Lines changed: 1753 additions & 0 deletions
Large diffs are not rendered by default.

.github/winbinder.php

Lines changed: 3682 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/quickpick-dispatcher.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,27 @@ on:
66
- closed
77
branches:
88
- 'main'
9+
release:
10+
types:
11+
- created
12+
- edited
13+
- prereleased
914
workflow_dispatch:
1015

1116
jobs:
12-
if_merged:
13-
if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
17+
dispatch_workflow:
18+
if: |
19+
(github.event_name == 'workflow_dispatch') ||
20+
(github.event_name == 'pull_request' && github.event.pull_request.merged == true) ||
21+
(github.event_name == 'release' && (github.event.action == 'created' || github.event.action == 'edited' || github.event.action == 'prereleased'))
1422
runs-on: ubuntu-latest
1523
steps:
1624
- name: Checkout
1725
uses: actions/checkout@v4
18-
1926
- name: Invoke workflow in another repo with inputs
20-
uses: benc-uk/workflow-dispatch@v1.2.4
27+
uses: peter-evans/repository-dispatch@v2
2128
with:
22-
workflow: combine_releases.yml
23-
repo: Bearsampp/Bearsampp
24-
# Required when using the `repo` option. Either a PAT or a token generated from the GitHub app or CLI
25-
token: "${{ secrets.GH_PAT }}"
29+
token: ${{ secrets.GH_PAT }}
30+
repository: Bearsampp/Bearsampp
31+
event-type: module_release_created
32+
client-payload: '{"workflow": "combine_releases.yml"}'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212

1313
# ignore "current" directories
1414
/**/current
15+
16+
# Qodo
17+
/.qodo

bin/ruby3.4.3/bearsampp.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rubyVersion = "3.4.3"
2+
rubyExe = "bin\ruby.exe"
3+
rubyConsoleExe = "bin\setrbvars.cmd"
4+
5+
bundleRelease = "@RELEASE_VERSION@"

bin/ruby3.4.3/rubygems/install.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@echo off
2+
set RUBYBINPATH=%~dp0..\bin
3+
pushd %RUBYBINPATH%
4+
set RUBYBINPATH=%CD%
5+
popd
6+
7+
CALL "%RUBYBINPATH%\gem.cmd" install rubygems-update.gem --local --no-document
8+
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
9+
10+
"%RUBYBINPATH%\gem.cmd" update --system --no-document
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rubygems = https://github.com/Bearsampp/modules-untouched/releases/download/ruby-2025.4.19/rubygems-update-3.6.8.gem

bin/ruby3.4.4-2/bearsampp.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rubyVersion = "3.4.4-2"
2+
rubyExe = "bin\ruby.exe"
3+
rubyConsoleExe = "bin\setrbvars.cmd"
4+
5+
bundleRelease = "@RELEASE_VERSION@"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@echo off
2+
set RUBYBINPATH=%~dp0..\bin
3+
pushd %RUBYBINPATH%
4+
set RUBYBINPATH=%CD%
5+
popd
6+
7+
CALL "%RUBYBINPATH%\gem.cmd" install rubygems-update.gem --local --no-document
8+
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
9+
10+
"%RUBYBINPATH%\gem.cmd" update --system --no-document
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rubygems = https://github.com/Bearsampp/modules-untouched/releases/download/ruby-2025.7.2/rubygems-update-3.6.9.gem

0 commit comments

Comments
 (0)