From 097a24dd5e5de35e009c26db32028cdb64f3a770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Wed, 27 Nov 2024 18:03:39 +0100 Subject: [PATCH] chore(packit): use makefile targets on actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use Makefile targets for `pre-sync` and `generate-archive` packit actions instead of doing the scripting in the yaml file and reorder files to sync Signed-off-by: Miguel Martín --- .packit.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 1f17c58a7..36f988b71 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,10 +5,10 @@ specfile_path: fido-device-onboard.spec files_to_sync: - src: - - patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch - - .packit.yaml - - fido-device-onboard.spec - - "fido-device-onboard-rs-*-vendor-patched.tar.xz" + - ".packit.yaml" + - "fido-device-onboard.spec" + - "fido-device-onboard-rs-*-vendor-patched.tar.xz" + - "*.patch" dest: . upstream_package_name: fido-device-onboard @@ -32,14 +32,10 @@ packages: actions: pre-sync: - - bash -c "./make-vendored-tarfile.sh ${PACKIT_PROJECT_VERSION}" - - bash -c "git restore Cargo.lock" + - make packit-pre-sync VERSION=${PACKIT_PROJECT_VERSION} create-archive: - - bash -c "cp ./patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch ." - - bash -c "git archive --prefix=fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar" - - bash -c "./make-vendored-tarfile.sh ${PACKIT_PROJECT_VERSION}" - - bash -c "tar -xvf fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar" - - bash -c "ls -1 ./fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar" + - make packit-create-archive VERSION=${PACKIT_PROJECT_VERSION} + - echo fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar jobs: - &fdo_copr_build