From 34dee9268f35d5fc0627464d2c57f0b1fe64c801 Mon Sep 17 00:00:00 2001 From: Saul Pablo Labajo Izquierdo Date: Fri, 6 Sep 2024 11:37:44 +0000 Subject: [PATCH] more fixes --- .github/workflows/server-buildpackage-rust.child.yaml | 10 ++++++++++ ci-scripts/ci_job_package_gst_rust_debian.sh | 1 + 2 files changed, 11 insertions(+) diff --git a/.github/workflows/server-buildpackage-rust.child.yaml b/.github/workflows/server-buildpackage-rust.child.yaml index cc0c95fe1..efe6ecff2 100644 --- a/.github/workflows/server-buildpackage-rust.child.yaml +++ b/.github/workflows/server-buildpackage-rust.child.yaml @@ -46,9 +46,19 @@ jobs: echo "GSTREAMER_RUST_PATCH_DIR=$PWD/server/gst-plugins-rs" >>$GITHUB_ENV echo "JOB_TIMESTAMP=$(date --utc +%Y%m%d%H%M%S)" >>$GITHUB_ENV + # Action: https://github.com/actions/download-artifact + - name: "Copy artifacts from previous jobs" + id: "copy-artifacts" + if: ${{ inputs.copyArtifacts }} + uses: "actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a" # v3.0.2 + with: + name: "artifacts" + path: "artifacts/" + - name: "Run job script" env: JOB_GIT_REPO: "${{ inputs.jobGitRepo }}" + JOB_GIT_NAME: "${{ inputs.jobGitName }}" JOB_DISTRO: "${{ matrix.jobDistro }}" JOB_RELEASE: "${{ inputs.jobRelease }}" DISABLE_APT_PROXY: "true" diff --git a/ci-scripts/ci_job_package_gst_rust_debian.sh b/ci-scripts/ci_job_package_gst_rust_debian.sh index f91d9d662..95201436c 100755 --- a/ci-scripts/ci_job_package_gst_rust_debian.sh +++ b/ci-scripts/ci_job_package_gst_rust_debian.sh @@ -90,6 +90,7 @@ mkdir tmpRepo cd tmpRepo git clone $JOB_GIT_REPO cd * +git checkout $JOB_GIT_NAME git apply "$GSTREAMER_RUST_PATCH_DIR"/debian.diff