setup correct .deb output directory

Kurento · Sep 6, 2024 · 2fb14c2 · 2fb14c2
1 parent 1301b2a
commit 2fb14c2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/server-buildpackage-rust.child.yaml b/.github/workflows/server-buildpackage-rust.child.yaml
@@ -25,6 +25,11 @@ on:
         description: "Enable to build release versions; disable for development builds"
         required: false
         type: "boolean"
+      directory:
+        description: "directory: Working directory for the job execution"
+        required: true
+        type: "string"
+        default: "./"
       runnerGroup:
         description: "runnerGroup: Set of runners where the workflow jobs should be run"
         required: false
@@ -46,23 +51,14 @@ 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"
-          INSTALL_PATH: "${{ steps.copy-artifacts.outputs.download-path }}"
+          INSTALL_PATH: "${{ inputs.directory }}"
         run: "ci_job_package_gst_rust_debian.sh"
 
 

diff --git a/ci-scripts/ci_job_package_gst_rust_debian.sh b/ci-scripts/ci_job_package_gst_rust_debian.sh
@@ -118,9 +118,10 @@ docker run --pull always --rm \
     --mount type=bind,src="$KURENTO_SCRIPTS_HOME",dst=/ci-scripts \
     --mount type=bind,src="${INSTALL_PATH:-$PWD}",dst=/packages \
     "kurento/rust-buildpackage:${JOB_DISTRO}" \
-        --install-files /packages \
         --timestamp "$JOB_TIMESTAMP" \
         "${KURENTO_BUILDPACKAGE_ARGS[@]}"
 
+cd ..
+rm -rf tmpRepo
 
 log "==================== END ===================="
diff --git a/ci-scripts/rust-buildpackage.sh b/ci-scripts/rust-buildpackage.sh
@@ -99,7 +99,7 @@ CFG_PACKAGE="main"
 
 while [[ $# -gt 0 ]]; do
     case "${1-}" in
-        --install-files)
+        --dstdir)
             if [[ -n "${2-}" ]]; then
                 CFG_DSTDIR="$(realpath "$2")"
                 shift

diff --git a/docker/rust-buildpackage/entrypoint.sh b/docker/rust-buildpackage/entrypoint.sh
@@ -47,7 +47,8 @@ fi
 
 # Get generated packages out from the Docker container
 if [[ -d /hostdir ]]; then
-    mv /packages/*.*deb /hostdir/ 2>/dev/null || true
+    mv ./*.*deb /hostdir/ 2>/dev/null || true
+    #FIXME if --dstdir is specified, .deb packages won't go into ./
 else
     echo "[Docker entrypoint] WARNING: No host dir where to put built packages"
 fi