Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: 74e6b15ede0592c1190e2e47f854d34edcb64953 https://github.com/openSUSE/open-build-service/commit/74e6b15ede0592c1190e2e... Author: Dan Čermák Date: 2022-11-03 (Thu, 03 Nov 2022) Changed paths: M src/api/app/models/concerns/scm_sync_enabled_step.rb A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_branch_fragment/1_1_1_8_4_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_branch_fragment/1_1_1_8_4_2.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query/1_1_1_8_3_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query/1_1_1_8_3_2.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query_and_a_branch_fragment/1_1_1_8_5_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query_and_a_branch_fragment/1_1_1_8_5_2.yml M src/api/spec/models/workflow/step/branch_package_step_spec.rb Log Message: ----------- Fix scmsync tag creation for packages with query/fragment in the url The SCM workflow creates bogus scmsync URLs when the branched package contains any query or fragment in its url, because neither the query nor the fragment are ever removed/modified. Only the new commit is appended as a fragment which can lead to duplication of the query & fragment. To fix this, we use the addressable module to override the fragment and set the `subdir` query via the URI parser instead of doing this ourselves. This fixes https://github.com/openSUSE/open-build-service/issues/13290 Commit: c8cc91a8fb584678d39f39dc6173db2c4d4200ef https://github.com/openSUSE/open-build-service/commit/c8cc91a8fb584678d39f39... Author: Dany Marcoux Date: 2022-11-03 (Thu, 03 Nov 2022) Changed paths: M src/api/app/models/concerns/scm_sync_enabled_step.rb A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_branch_fragment/1_1_1_8_4_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_branch_fragment/1_1_1_8_4_2.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query/1_1_1_8_3_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query/1_1_1_8_3_2.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query_and_a_branch_fragment/1_1_1_8_5_1.yml A src/api/spec/cassettes/Workflow_Step_BranchPackageStep/_call/when_the_SCM_is_GitHub/when_scmsync_is_active/on_a_package_level_with_a_subdir_query_and_a_branch_fragment/1_1_1_8_5_2.yml M src/api/spec/models/workflow/step/branch_package_step_spec.rb Log Message: ----------- Merge pull request #13298 from dcermak/fix-scmsync-uri-creation Fix scmsync tag creation for packages with query/fragment in the url Compare: https://github.com/openSUSE/open-build-service/compare/d4cb79709538...c8cc91...