Merge pull request #14260 from krauselukas/fix/rpm_spec_yaml_resolve

Fix pathname and shebang when calling `resolve_swagger_yaml` script during build
openSUSE · Apr 28, 2023 · 6aaccb2 · 6aaccb2
2 parents 9940c14 + 1b9e0ac
commit 6aaccb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dist/obs-server.spec b/dist/obs-server.spec
@@ -498,8 +498,8 @@ make
 
 # combine swagger yaml files to one big yaml file by resolving all references
 # and replace the development version
-pushd /dist
-ruby resolve_swagger_yaml.rb -i %{__obs_api_prefix}/public/apidocs-new/OBS-v2.10.50.yaml -o %{__obs_api_prefix}/public/apidocs-new/OBS-v2.10.50.yaml -f
+pushd dist/
+./resolve_swagger_yaml.rb -i ../src/api/public/apidocs-new/OBS-v2.10.50.yaml -o ../src/api/public/apidocs-new/OBS-v2.10.50.yaml -f
 popd
 
 %install

diff --git a/dist/resolve_swagger_yaml.rb b/dist/resolve_swagger_yaml.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 require 'optparse'