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.

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

Merge sdf9 ➡️ sdf12 #1224

Merged
merged 4 commits into from
Feb 1, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Bionic CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@bionic
Expand All @@ -17,7 +17,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
PACKAGE: sdformat12
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master
Expand Down
6 changes: 3 additions & 3 deletions tools/xmlschema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,23 @@ def printXSD(_file, _spaces, _elem)
if infile.nil?
puts "Missing option -i."
exit
elsif !File.exists?(infile)
elsif !File.exist?(infile)
puts "Input file[#{infile}] does not exist\n"
exit
end

if $path.nil?
puts "Missing option -s."
exit
elsif !Dir.exists?($path)
elsif !Dir.exist?($path)
puts "SDF source dir[#{$path}] does not exist\n"
exit
end

if outdir.nil?
puts "Missing output directory, option -o."
exit
elsif !Dir.exists?(outdir)
elsif !Dir.exist?(outdir)
Dir.mkdir(outdir)
end

Expand Down