Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/modgc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
${SETARCH} ../src/configure -C --disable-install-doc --with-modular-gc="${MODULAR_GC_DIR}" \
${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}

- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
- uses: actions-rust-lang/setup-rust-toolchain@a0b538fa0b742a6aa35d6e2c169b4bd06d225a98 # v1.15.3
- name: Set MMTk environment variables
run: |
echo 'EXCLUDES=../src/test/.excludes-mmtk' >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zjit-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
rustup install ${{ matrix.rust_version }} --profile minimal
rustup default ${{ matrix.rust_version }}

- uses: taiki-e/install-action@a3324fb0eb94b8230ec968c3389c1b7929fc2f3b # v2.68.13
- uses: taiki-e/install-action@d6e286fa45544157a02d45a43742857ebbc25d12 # v2.68.16
with:
tool: nextest@0.9
if: ${{ matrix.test_task == 'zjit-check' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zjit-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
ruby-version: '3.1'
bundler: none

- uses: taiki-e/install-action@a3324fb0eb94b8230ec968c3389c1b7929fc2f3b # v2.68.13
- uses: taiki-e/install-action@d6e286fa45544157a02d45a43742857ebbc25d12 # v2.68.16
with:
tool: nextest@0.9
if: ${{ matrix.test_task == 'zjit-check' }}
Expand Down
12 changes: 8 additions & 4 deletions lib/bundler/templates/newgem/github/workflows/build-gems.yml.tt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
- "cross-gem/*"
workflow_dispatch:

permissions:
contents: read
packages: write

jobs:
ci-data:
runs-on: ubuntu-latest
Expand All @@ -25,7 +29,7 @@ jobs:
source-gem:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -34,7 +38,7 @@ jobs:
- name: Build gem
run: bundle exec rake build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v7
with:
name: source-gem
path: pkg/*.gem
Expand All @@ -47,7 +51,7 @@ jobs:
matrix:
platform: ${{ fromJSON(needs.ci-data.outputs.result).supported-ruby-platforms }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -59,7 +63,7 @@ jobs:
platform: ${{ matrix.platform }}
ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ',') }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v7
with:
name: cross-gem
path: ${{ steps.cross-gem.outputs.gem-path }}
5 changes: 4 additions & 1 deletion lib/bundler/templates/newgem/github/workflows/main.yml.tt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:

pull_request:

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -17,7 +20,7 @@ jobs:
- '<%= RUBY_VERSION %>'

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
<%- if config[:ext] == 'rust' -%>
Expand Down
5 changes: 0 additions & 5 deletions spec/bundled_gems_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ def self.ruby=(ruby)
require_relative "bundler/support/rubygems_ext"
Spec::Helpers.install_dev_bundler
FileUtils.mkdir_p Spec::Path.gem_path

%w[sinatra rack tilt rack-protection rack-session rack-test mustermann base64 logger compact_index].each do |gem|
path, = Dir[File.expand_path("../.bundle/gems/#{gem}-*/lib", __dir__)]
$LOAD_PATH.unshift(path) if path
end
end

config.around(:each) do |example|
Expand Down
9 changes: 8 additions & 1 deletion spec/bundler/support/path.rb
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,15 @@ def sinatra_dependency_paths
base64
logger
cgi
compact_index
]
Dir[scoped_base_system_gem_path.join("gems/{#{deps.join(",")}}-*/lib")].map(&:to_s)
path = if ruby_core? && deps.all? {|dep| !Dir[source_root.join(".bundle/gems/#{dep}-*")].empty? }
source_root.join(".bundle")
else
scoped_base_system_gem_path
end

Dir[path.join("gems/{#{deps.join(",")}}-*/lib")].map(&:to_s)
end

private
Expand Down
40 changes: 39 additions & 1 deletion tool/lrama/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
# NEWS for Lrama

## Lrama 0.8.0 (2026-xx-xx)
## Lrama 0.8.0 (2026-03-01)

### Support parser generation without %union directive (Bison compatibility)

When writing simple parsers or prototypes, defining `%union` can be cumbersome and unnecessary.
Lrama now supports generating parsers without the `%union` directive, defaulting `YYSTYPE` to `int`, the same behavior as Bison.

When `%union` is not defined:

- `YYSTYPE` defaults to `int`
- Semantic value references are generated without union member access
- The generated parser behaves identically to Bison-generated parsers

https://github.com/ruby/lrama/pull/765

### Allow named references on parameterized rule calls inside %rule

Named references (e.g. `[opt]`) can now be used with parameterized rule calls inside a `%rule` body.
Previously, writing `f_opt_arg(value)[opt]` inside a `%rule` resulted in a parse error.

```yacc
%rule example(X): f_opt_arg(X)[opt] { $$ = $opt; }
;
```

https://github.com/ruby/lrama/pull/778

### Fix nested parameterized rule calls in subsequent argument positions

Nested parameterized rule calls (e.g. `f_opt(number)`) can now appear in any argument position, not only the first one.
Previously, using a nested call as the second or later argument caused a parse error.

```yacc
%%
program: args_list(f_opt(number), opt_tail(string), number)
;
```

https://github.com/ruby/lrama/pull/779

## Lrama 0.7.1 (2025-12-24)

Expand Down
Loading