Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-318 Used a realpath for load dependencies. #326

Merged
merged 5 commits into from
Feb 24, 2023
Merged

GH-318 Used a realpath for load dependencies. #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
363915d
GH-318 Used a realpath for load dependencies.
bit0rez Jan 18, 2023
ac0adc9
GH-318 Fixed variable scope.
bit0rez Jan 19, 2023
0e53e4b
GH-318 Used __dir__ to get an absolute path to the current file's dir…
bit0rez Jan 19, 2023
1db6f04
GH-318 Fixed test matrix generation script.
bit0rez Jan 31, 2023
2e2ce4c
Merge branch 'main' into GH-318-fix_languageserver_symlink
bit0rez Feb 14, 2023
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/create-test-matrix.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ param([Switch]$Raw)
$Jobs = @()

# All default OSes we test on
$OSList =@('ubuntu-latest', 'windows-latest')
$OSList =@('ubuntu-20.04', 'windows-2019')
# All default Ruby and Puppet combinations
# Pin to Ruby 2.5.8 due to
# - https://github.com/chef/win32-dir/commit/cf3e31ec90e47d988840759e5d755a9460e192ff
Expand Down
9 changes: 5 additions & 4 deletions puppet-languageserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# frozen_string_literal: true

# Add the language server into the load path
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
$LOAD_PATH.unshift(File.join(__dir__, 'lib'))

# Add the vendored gems into the load path
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'puppet-lint', 'lib'))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'molinillo', 'lib'))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor', 'puppetfile-resolver', 'lib'))
$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'puppet-lint', 'lib'))
$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'molinillo', 'lib'))
$LOAD_PATH.unshift(File.join(__dir__, 'vendor', 'puppetfile-resolver', 'lib'))

require 'puppet_languageserver'

Expand Down