From 428ced8b5a9653761d12676f3e59988c60f26fa6 Mon Sep 17 00:00:00 2001 From: Lukas Krause Date: Fri, 28 Apr 2023 13:28:48 +0200 Subject: [PATCH 1/3] Use correct path name to dist folder in obs-server.spec --- dist/obs-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/obs-server.spec b/dist/obs-server.spec index 9d692d6f73c..547a4ea4dde 100644 --- a/dist/obs-server.spec +++ b/dist/obs-server.spec @@ -498,7 +498,7 @@ make # combine swagger yaml files to one big yaml file by resolving all references # and replace the development version -pushd /dist +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 popd From 08f96c82a4248695724f8fc14cadb05a91504b57 Mon Sep 17 00:00:00 2001 From: Lukas Krause Date: Fri, 28 Apr 2023 13:47:34 +0200 Subject: [PATCH 2/3] Fix ruby shebang and call resolve_swagger_yaml script --- dist/obs-server.spec | 2 +- dist/resolve_swagger_yaml.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/obs-server.spec b/dist/obs-server.spec index 547a4ea4dde..a267bf0c5aa 100644 --- a/dist/obs-server.spec +++ b/dist/obs-server.spec @@ -499,7 +499,7 @@ 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 +./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 popd %install diff --git a/dist/resolve_swagger_yaml.rb b/dist/resolve_swagger_yaml.rb index dac305ee283..100781683ce 100755 --- 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' From 1b9e0ac67454bb6992099827df5855f5da8a3cd7 Mon Sep 17 00:00:00 2001 From: Lukas Krause Date: Fri, 28 Apr 2023 14:39:15 +0200 Subject: [PATCH 3/3] Use correct path to swagger yaml --- dist/obs-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/obs-server.spec b/dist/obs-server.spec index a267bf0c5aa..38d424af0dc 100644 --- a/dist/obs-server.spec +++ b/dist/obs-server.spec @@ -499,7 +499,7 @@ make # combine swagger yaml files to one big yaml file by resolving all references # and replace the development version pushd dist/ -./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 +./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