From 5bcc446d5ac26a8bc00697a9ec715d4e89a0eca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 10 Jan 2025 17:40:59 +0100 Subject: [PATCH 1/2] Fix the OBS release GitHub Action --- .github/workflows/obs-release.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/obs-release.yml b/.github/workflows/obs-release.yml index 2f24512a7d..78e01799bc 100644 --- a/.github/workflows/obs-release.yml +++ b/.github/workflows/obs-release.yml @@ -1,5 +1,8 @@ # Publish a new version -# - Submit the packages to systemsmanagement:Agama:Devel +# - Submit the packages to the OBS project defined in OBS_PROJECT_RELEASE variable +# at GitHub (in the original repository it is set to systemsmanagement:Agama:Release, +# see https://github.com/agama-project/agama/settings/variables/actions, +# you might change that in forks) # - Send submit requests name: Release @@ -11,7 +14,7 @@ on: - v[0-9]* jobs: - # Note: agama-integration-tests and the Live ISO are currently not submitted + # Note: the Live ISO is currently not submitted update_rust: uses: ./.github/workflows/obs-staging-shared.yml @@ -19,8 +22,8 @@ jobs: secrets: inherit with: install_packages: obs-service-cargo_audit obs-service-cargo_vendor - project_name: systemsmanagement:Agama:Devel package_name: agama + service_file: rust/package/_service update_web: uses: ./.github/workflows/obs-staging-shared.yml @@ -28,12 +31,10 @@ jobs: secrets: inherit with: install_packages: obs-service-node_modules - project_name: systemsmanagement:Agama:Devel - package_name: cockpit-agama + package_name: agama-web-ui + service_file: web/package/_service update_service: uses: ./.github/workflows/obs-service-shared.yml # pass all secrets secrets: inherit - with: - project_name: systemsmanagement:Agama:Devel From 085cbd34187ef493f187131b2d99b7d6ef9dc3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 10 Jan 2025 17:46:08 +0100 Subject: [PATCH 2/2] Submit also the product definition package --- .github/workflows/obs-release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/obs-release.yml b/.github/workflows/obs-release.yml index 78e01799bc..9928560fa6 100644 --- a/.github/workflows/obs-release.yml +++ b/.github/workflows/obs-release.yml @@ -38,3 +38,11 @@ jobs: uses: ./.github/workflows/obs-service-shared.yml # pass all secrets secrets: inherit + + update_products: + uses: ./.github/workflows/obs-staging-shared.yml + # pass all secrets + secrets: inherit + with: + package_name: agama-products + service_file: products.d/_service