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: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 2.5.8
gemfile: Gemfile.2.5
- ruby: 3.2.0
gemfile: Gemfile
- ruby: 3.4.1
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.8
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented here.

Rascal follows semantic versioning. This has little consequence pre 1.0, so expect breaking changes.

## 0.3.9 (2026-06-19)

- Support variables within service definitions.
- Drop support for Ruby < 3.


## 0.3.8 (2025-02-10)

- Ruby 3.4 support.
Expand Down
1 change: 0 additions & 1 deletion Gemfile.2.5

This file was deleted.

125 changes: 0 additions & 125 deletions Gemfile.2.5.lock

This file was deleted.

2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
rascal (0.3.8)
rascal (0.3.9)
thor (>= 1.0.0)

GEM
Expand Down
3 changes: 1 addition & 2 deletions lib/rascal/environments_definition/gitlab.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def build_services(name, services, volumes: [], env_variables: {})
alias_name: service_config['alias'],
image: service_config['name'],
volumes: volumes,
env_variables: env_variables,
env_variables: env_variables.merge(service_config.fetch('variables', {})),
command: service_config['command'],
)
end
Expand All @@ -144,4 +144,3 @@ def build_volumes(name, volume_config)
end
end
end

2 changes: 1 addition & 1 deletion lib/rascal/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Rascal
VERSION = "0.3.8"
VERSION = "0.3.9"
end
23 changes: 23 additions & 0 deletions spec/rascal/environments_definition/gitlab_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,29 @@ def from_config(yaml, name)
)
end

it 'sets env variables for services' do
environment = from_config(<<~YAML, 'job')
job:
image: job-1-image:latest
variables:
FOO: foo
BAR: bar
services:
- name: service-1-image
alias: service-1
command: bin/start
variables:
FOO: overridden foo
BAZ: baz
YAML

expect(environment.services.first.env_variables).to eq(
'FOO' => 'overridden foo',
'BAR' => 'bar',
'BAZ' => 'baz',
)
end

it 'adds a build and repo volume by default' do
environment = from_config(<<~YAML, 'job')
job:
Expand Down
Loading