From 894ddb5a77a5b96654c5178a6a6889c756cc134e Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 15:39:26 +0100 Subject: [PATCH 01/15] DEB builder fixes --- .../action.yml | 14 ++++++++------ .github/workflows/build-deb-packages.yml | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) rename .github/actions/{build-debian-package => build-deb-package}/action.yml (82%) diff --git a/.github/actions/build-debian-package/action.yml b/.github/actions/build-deb-package/action.yml similarity index 82% rename from .github/actions/build-debian-package/action.yml rename to .github/actions/build-deb-package/action.yml index 575e81bb2cf..66f65fc1816 100644 --- a/.github/actions/build-debian-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -1,5 +1,5 @@ -name: "Build Debian Package" -description: "Builds a Debian source package using a Docker image" +name: "Build DEB Package" +description: "Builds a DEB package using a Docker image" inputs: ice_version: description: "The ICE version to build" @@ -18,9 +18,6 @@ inputs: runs: using: "composite" steps: - - name: Check out repository - uses: actions/checkout@v4 - - name: Build Docker Image run: docker build -f ${{ inputs.dockerfile_path }} -t ${{ inputs.docker_image }} . shell: bash @@ -40,4 +37,9 @@ runs: uses: actions/upload-artifact@v4 with: name: debian-packages-${{ inputs.os }} - path: output/ + path: | + output/*.deb + output/*.dsc + output/*.tar.gz + output/*.changes + output/*.buildinfo diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 57b171b7a6b..8ed48e2732c 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -28,8 +28,11 @@ jobs: dockerfile_path: ice/packaging/dpkg/ubuntu-24.04-arm/Dockerfile steps: + - name: Check out repository + uses: actions/checkout@v4 + - name: Call Build Debian Package Action - uses: ./.github/actions/build-debian-package + uses: ./.github/actions/build-deb-package with: ice_version: ${{ inputs.ice_version }} deb_build_options: ${{ inputs.deb_build_options }} From 6858442689eb0a64a39d1dee1710e6852d0f5e10 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 15:52:39 +0100 Subject: [PATCH 02/15] Fix image name --- .github/actions/build-deb-package/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index 66f65fc1816..dd093ad1fd6 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -19,7 +19,7 @@ runs: using: "composite" steps: - name: Build Docker Image - run: docker build -f ${{ inputs.dockerfile_path }} -t ${{ inputs.docker_image }} . + run: docker build -f ${{ inputs.dockerfile_path }} -t ice-debian-package-builder . shell: bash - name: Run Package Build with Mounted Source From 9f7d4bc3d9e2dc50b3138b527d48cfecb0c4a98f Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 16:04:11 +0100 Subject: [PATCH 03/15] Fix build paths --- .github/actions/build-deb-package/action.yml | 4 +++- .github/workflows/build-deb-packages.yml | 4 ++-- packaging/dpkg/{ => docker}/ubuntu-24.04/Dockerfile | 0 3 files changed, 5 insertions(+), 3 deletions(-) rename packaging/dpkg/{ => docker}/ubuntu-24.04/Dockerfile (100%) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index dd093ad1fd6..3362972af80 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -26,11 +26,12 @@ runs: run: | mkdir -p output docker run --rm \ - -v $PWD/ice:/workspace/ice \ + -v $PWD/../../../ice:/workspace/ice \ -v $PWD/output:/workspace/build \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ ice-debian-package-builder + working-directory: packaging/dpkg shell: bash - name: Upload Artifacts @@ -43,3 +44,4 @@ runs: output/*.tar.gz output/*.changes output/*.buildinfo + working-directory: packaging/dpkg diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 8ed48e2732c..0d326e286f0 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -21,11 +21,11 @@ jobs: include: - os: ubuntu-24.04 runner: ubuntu-24.04 - dockerfile_path: ice/packaging/dpkg/ubuntu-24.04/Dockerfile + dockerfile_path: packaging/dpkg/docker/ubuntu-24.04/Dockerfile - os: ubuntu-24.04-arm runner: ubuntu-24.04-arm - dockerfile_path: ice/packaging/dpkg/ubuntu-24.04-arm/Dockerfile + dockerfile_path: packaging/dpkg/docker/ubuntu-24.04/Dockerfile steps: - name: Check out repository diff --git a/packaging/dpkg/ubuntu-24.04/Dockerfile b/packaging/dpkg/docker/ubuntu-24.04/Dockerfile similarity index 100% rename from packaging/dpkg/ubuntu-24.04/Dockerfile rename to packaging/dpkg/docker/ubuntu-24.04/Dockerfile From c35ea75e9fe275267cd803bb4da69d72029384df Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 16:06:14 +0100 Subject: [PATCH 04/15] Fix upload action --- .github/actions/build-deb-package/action.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index 3362972af80..bf76cacf811 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -39,9 +39,8 @@ runs: with: name: debian-packages-${{ inputs.os }} path: | - output/*.deb - output/*.dsc - output/*.tar.gz - output/*.changes - output/*.buildinfo - working-directory: packaging/dpkg + packaging/dpkg/output/*.deb + packaging/dpkg/output/*.dsc + packaging/dpkg/output/*.tar.gz + packaging/dpkg/output/*.changes + packaging/dpkg/output/*.buildinfo From a188f1073a6fcdd69d49261fa8c887833fbdfb96 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 17:55:08 +0100 Subject: [PATCH 05/15] DEB builder fixes --- .github/actions/build-deb-package/action.yml | 22 ++++++++++--------- packaging/dpkg/build-package.sh | 11 ++++------ packaging/dpkg/docker/ubuntu-24.04/Dockerfile | 12 ---------- 3 files changed, 16 insertions(+), 29 deletions(-) mode change 100644 => 100755 packaging/dpkg/build-package.sh diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index bf76cacf811..dcdbf0bec9d 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -19,19 +19,21 @@ runs: using: "composite" steps: - name: Build Docker Image - run: docker build -f ${{ inputs.dockerfile_path }} -t ice-debian-package-builder . + run: docker build --pull -f ${{ inputs.dockerfile_path }} -t ice-debian-package-builder . shell: bash + working-directory: packaging/dpkg - name: Run Package Build with Mounted Source run: | - mkdir -p output + mkdir -p ${{RUNNER_TEMP}}/build docker run --rm \ - -v $PWD/../../../ice:/workspace/ice \ - -v $PWD/output:/workspace/build \ + -v ${{ env.GITHUB_WORKSPACE }}:/workspace/ice \ + -v ${{ env.RUNNER_TEMP }}/build:/workspace/build \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ + --entrypoint /workspace/ice/packaging/dpkg/build-package.sh \ ice-debian-package-builder - working-directory: packaging/dpkg + shell: bash - name: Upload Artifacts @@ -39,8 +41,8 @@ runs: with: name: debian-packages-${{ inputs.os }} path: | - packaging/dpkg/output/*.deb - packaging/dpkg/output/*.dsc - packaging/dpkg/output/*.tar.gz - packaging/dpkg/output/*.changes - packaging/dpkg/output/*.buildinfo + ${{RUNNER_TEMP}}/build/*.deb + ${{RUNNER_TEMP}}/build/*.dsc + ${{RUNNER_TEMP}}/build/*.tar.gz + ${{RUNNER_TEMP}}/build/*.changes + ${{RUNNER_TEMP}}/build/*.buildinfo diff --git a/packaging/dpkg/build-package.sh b/packaging/dpkg/build-package.sh old mode 100644 new mode 100755 index 2fe4993427b..a651143ae60 --- a/packaging/dpkg/build-package.sh +++ b/packaging/dpkg/build-package.sh @@ -7,19 +7,16 @@ if [ -z "$ICE_VERSION" ]; then exit 1 fi -# Set working directory -cd /workspace - # Generate the upstream tarball echo "Creating tarball for ICE_VERSION=$ICE_VERSION" -tar -czf zeroc-ice_${ICE_VERSION}.orig.tar.gz --exclude=debian -C /workspace/ice . +tar -czf /workspace/build/zeroc-ice_${ICE_VERSION}.orig.tar.gz --exclude=debian --exclude=.build -C /workspace/ice . # Create build directory and unpack -mkdir -p build -cd build +mkdir -p /workspace/build/ice +cd /workspace/build/ice tar xzf ../zeroc-ice_${ICE_VERSION}.orig.tar.gz # Copy Debian packaging files and build -cp -rfv ../ice/packaging/dpkg/debian . +cp -rfv /workspace/ice/packaging/dpkg/debian . dpkg-buildpackage -S dpkg-buildpackage -b -uc -us diff --git a/packaging/dpkg/docker/ubuntu-24.04/Dockerfile b/packaging/dpkg/docker/ubuntu-24.04/Dockerfile index 5cc772e867c..b7beef582dd 100644 --- a/packaging/dpkg/docker/ubuntu-24.04/Dockerfile +++ b/packaging/dpkg/docker/ubuntu-24.04/Dockerfile @@ -9,15 +9,3 @@ RUN apt-get update && apt-get install -y \ build-essential \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean - -# Set working directory -WORKDIR /workspace - -# Copy build script into the container -COPY build-package.sh /usr/local/bin/build-package.sh - -# Make the script executable -RUN chmod +x /usr/local/bin/build-package.sh - -# Set the default command to run the build script (can be overridden) -ENTRYPOINT ["/usr/local/bin/build-package.sh"] From 2851acfa995bed9bbc7363b68383cd272108d7f3 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 18:12:31 +0100 Subject: [PATCH 06/15] Fix image name and artifact uploads --- .github/actions/build-deb-package/action.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index dcdbf0bec9d..ad9ce3af763 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -19,7 +19,7 @@ runs: using: "composite" steps: - name: Build Docker Image - run: docker build --pull -f ${{ inputs.dockerfile_path }} -t ice-debian-package-builder . + run: docker build --pull -f ${{ inputs.dockerfile_path }} -t ice-deb-package-builder . shell: bash working-directory: packaging/dpkg @@ -32,17 +32,19 @@ runs: -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ --entrypoint /workspace/ice/packaging/dpkg/build-package.sh \ - ice-debian-package-builder + ice-deb-package-builder shell: bash - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: debian-packages-${{ inputs.os }} + name: deb-packages-${{ inputs.os }} path: | ${{RUNNER_TEMP}}/build/*.deb + ${{RUNNER_TEMP}}/build/*.ddeb ${{RUNNER_TEMP}}/build/*.dsc + ${{RUNNER_TEMP}}/build/*.tar.xz ${{RUNNER_TEMP}}/build/*.tar.gz ${{RUNNER_TEMP}}/build/*.changes ${{RUNNER_TEMP}}/build/*.buildinfo From 5cda5d172ebeca93c161e0859f1cc7c9573edc8d Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 18:13:35 +0100 Subject: [PATCH 07/15] Fix env syntax --- .github/actions/build-deb-package/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index ad9ce3af763..69936de496b 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -25,7 +25,7 @@ runs: - name: Run Package Build with Mounted Source run: | - mkdir -p ${{RUNNER_TEMP}}/build + mkdir -p ${{ env.RUNNER_TEMP }}/build docker run --rm \ -v ${{ env.GITHUB_WORKSPACE }}:/workspace/ice \ -v ${{ env.RUNNER_TEMP }}/build:/workspace/build \ @@ -41,10 +41,10 @@ runs: with: name: deb-packages-${{ inputs.os }} path: | - ${{RUNNER_TEMP}}/build/*.deb - ${{RUNNER_TEMP}}/build/*.ddeb - ${{RUNNER_TEMP}}/build/*.dsc - ${{RUNNER_TEMP}}/build/*.tar.xz - ${{RUNNER_TEMP}}/build/*.tar.gz - ${{RUNNER_TEMP}}/build/*.changes - ${{RUNNER_TEMP}}/build/*.buildinfo + ${{ env.RUNNER_TEMP }}/build/*.deb + ${{ env.RUNNER_TEMP }}/build/*.ddeb + ${{ env.RUNNER_TEMP }}/build/*.dsc + ${{ env.RUNNER_TEMP }}/build/*.tar.xz + ${{ env.RUNNER_TEMP }}/build/*.tar.gz + ${{ env.RUNNER_TEMP }}/build/*.changes + ${{ env.RUNNER_TEMP }}/build/*.buildinfo From b7df46e19753a1d885cb419cd03340557d1f85e0 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 18:20:52 +0100 Subject: [PATCH 08/15] Fix working directory for build docker image --- .github/actions/build-deb-package/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index 69936de496b..a3a9d013bfc 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -21,7 +21,6 @@ runs: - name: Build Docker Image run: docker build --pull -f ${{ inputs.dockerfile_path }} -t ice-deb-package-builder . shell: bash - working-directory: packaging/dpkg - name: Run Package Build with Mounted Source run: | From 368ac8db9f8996ef687c0940eea3da4ec3dcee42 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 18:24:49 +0100 Subject: [PATCH 09/15] Move build output to $HOME --- .github/actions/build-deb-package/action.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index a3a9d013bfc..45f08f2779e 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -24,15 +24,14 @@ runs: - name: Run Package Build with Mounted Source run: | - mkdir -p ${{ env.RUNNER_TEMP }}/build + mkdir -p ${{ env.HOME }}/build docker run --rm \ -v ${{ env.GITHUB_WORKSPACE }}:/workspace/ice \ - -v ${{ env.RUNNER_TEMP }}/build:/workspace/build \ + -v ${{ env.HOME }}/build:/workspace/build \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ --entrypoint /workspace/ice/packaging/dpkg/build-package.sh \ ice-deb-package-builder - shell: bash - name: Upload Artifacts @@ -40,10 +39,10 @@ runs: with: name: deb-packages-${{ inputs.os }} path: | - ${{ env.RUNNER_TEMP }}/build/*.deb - ${{ env.RUNNER_TEMP }}/build/*.ddeb - ${{ env.RUNNER_TEMP }}/build/*.dsc - ${{ env.RUNNER_TEMP }}/build/*.tar.xz - ${{ env.RUNNER_TEMP }}/build/*.tar.gz - ${{ env.RUNNER_TEMP }}/build/*.changes - ${{ env.RUNNER_TEMP }}/build/*.buildinfo + ${{ env.HOME }}/build/*.deb + ${{ env.HOME }}/build/*.ddeb + ${{ env.HOME }}/build/*.dsc + ${{ env.HOME }}/build/*.tar.xz + ${{ env.HOME }}/build/*.tar.gz + ${{ env.HOME }}/build/*.changes + ${{ env.HOME }}/build/*.buildinfo From 29cdabdb7c0297fa45b24e61ef87eccd50a1b232 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 18:30:47 +0100 Subject: [PATCH 10/15] Fix env syntax --- .github/actions/build-deb-package/action.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index 45f08f2779e..ba96b18658b 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -24,10 +24,10 @@ runs: - name: Run Package Build with Mounted Source run: | - mkdir -p ${{ env.HOME }}/build + mkdir -p "$HOME/build" docker run --rm \ - -v ${{ env.GITHUB_WORKSPACE }}:/workspace/ice \ - -v ${{ env.HOME }}/build:/workspace/build \ + -v "$GITHUB_WORKSPACE:/workspace/ice" \ + -v "$HOME/build:/workspace/build" \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ --entrypoint /workspace/ice/packaging/dpkg/build-package.sh \ @@ -39,10 +39,10 @@ runs: with: name: deb-packages-${{ inputs.os }} path: | - ${{ env.HOME }}/build/*.deb - ${{ env.HOME }}/build/*.ddeb - ${{ env.HOME }}/build/*.dsc - ${{ env.HOME }}/build/*.tar.xz - ${{ env.HOME }}/build/*.tar.gz - ${{ env.HOME }}/build/*.changes - ${{ env.HOME }}/build/*.buildinfo + "$HOME/build/*.deb" + "$HOME/build/*.ddeb" + "$HOME/build/*.dsc" + "$HOME/build/*.tar.xz" + "$HOME/build/*.tar.gz" + "$HOME/build/*.changes" + "$HOME/build/*.buildinfo" From 050e53467733e31ae6f35c050f206d405b04a9d9 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 20:19:15 +0100 Subject: [PATCH 11/15] Update .github/actions/build-deb-package/action.yml Co-authored-by: Joe George --- .github/actions/build-deb-package/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index ba96b18658b..8f70e79f623 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -30,8 +30,7 @@ runs: -v "$HOME/build:/workspace/build" \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ - --entrypoint /workspace/ice/packaging/dpkg/build-package.sh \ - ice-deb-package-builder + \ ice-deb-package-builder /workspace/ice/packaging/dpkg/build-package.sh shell: bash - name: Upload Artifacts From bb3c0ee7484d0bdb583949aaa93f82d726cf4a7c Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 20:38:59 +0100 Subject: [PATCH 12/15] Review fixes --- .github/actions/build-deb-package/action.yml | 20 +++++++++----------- .github/workflows/build-deb-packages.yml | 6 ++++-- packaging/dpkg/build-package.sh | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index 8f70e79f623..cfe3f119779 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -24,13 +24,11 @@ runs: - name: Run Package Build with Mounted Source run: | - mkdir -p "$HOME/build" docker run --rm \ - -v "$GITHUB_WORKSPACE:/workspace/ice" \ - -v "$HOME/build:/workspace/build" \ + -v "$GITHUB_WORKSPACE:/workspace" \ -e ICE_VERSION=${{ inputs.ice_version }} \ -e DEB_BUILD_OPTIONS="${{ inputs.deb_build_options }}" \ - \ ice-deb-package-builder /workspace/ice/packaging/dpkg/build-package.sh + ice-deb-package-builder /workspace/ice/packaging/dpkg/build-package.sh shell: bash - name: Upload Artifacts @@ -38,10 +36,10 @@ runs: with: name: deb-packages-${{ inputs.os }} path: | - "$HOME/build/*.deb" - "$HOME/build/*.ddeb" - "$HOME/build/*.dsc" - "$HOME/build/*.tar.xz" - "$HOME/build/*.tar.gz" - "$HOME/build/*.changes" - "$HOME/build/*.buildinfo" + *.deb + *.ddeb + *.dsc + *.tar.xz + *.tar.gz + *.changes + *.buildinfo diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 0d326e286f0..03e3cfb20d9 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -21,15 +21,17 @@ jobs: include: - os: ubuntu-24.04 runner: ubuntu-24.04 - dockerfile_path: packaging/dpkg/docker/ubuntu-24.04/Dockerfile + dockerfile_path: ice/packaging/dpkg/docker/ubuntu-24.04/Dockerfile - os: ubuntu-24.04-arm runner: ubuntu-24.04-arm - dockerfile_path: packaging/dpkg/docker/ubuntu-24.04/Dockerfile + dockerfile_path: ice/packaging/dpkg/docker/ubuntu-24.04/Dockerfile steps: - name: Check out repository uses: actions/checkout@v4 + with: + path: ice - name: Call Build Debian Package Action uses: ./.github/actions/build-deb-package diff --git a/packaging/dpkg/build-package.sh b/packaging/dpkg/build-package.sh index a651143ae60..43a46dc8b87 100755 --- a/packaging/dpkg/build-package.sh +++ b/packaging/dpkg/build-package.sh @@ -9,11 +9,11 @@ fi # Generate the upstream tarball echo "Creating tarball for ICE_VERSION=$ICE_VERSION" -tar -czf /workspace/build/zeroc-ice_${ICE_VERSION}.orig.tar.gz --exclude=debian --exclude=.build -C /workspace/ice . +tar -czf /workspace/zeroc-ice_${ICE_VERSION}.orig.tar.gz -C /workspace/ice . # Create build directory and unpack -mkdir -p /workspace/build/ice -cd /workspace/build/ice +mkdir -p /workspace/build +cd /workspace/build tar xzf ../zeroc-ice_${ICE_VERSION}.orig.tar.gz # Copy Debian packaging files and build From 134e8bb5b345c2307221492a04b970f4f65c85e9 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 20:40:48 +0100 Subject: [PATCH 13/15] Typos --- .github/actions/build-deb-package/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-deb-package/action.yml b/.github/actions/build-deb-package/action.yml index cfe3f119779..018ffab62a4 100644 --- a/.github/actions/build-deb-package/action.yml +++ b/.github/actions/build-deb-package/action.yml @@ -2,7 +2,7 @@ name: "Build DEB Package" description: "Builds a DEB package using a Docker image" inputs: ice_version: - description: "The ICE version to build" + description: "The Ice version to build" required: true deb_build_options: description: "DEB_BUILD_OPTIONS for the build" From 924bd28e86db4cc31d1c03ef6810cdd293ff4a17 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 20:41:36 +0100 Subject: [PATCH 14/15] more typos --- .github/workflows/build-deb-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 03e3cfb20d9..aea0779b83a 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: ice_version: - description: "The ICE version to build" + description: "The Ice version to build" required: true default: "3.8.0~alpha0" deb_build_options: From 97247a69d4bc3316619c46fbde44f4b7ea8f75fc Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Feb 2025 20:45:22 +0100 Subject: [PATCH 15/15] Fix action path --- .github/workflows/build-deb-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index aea0779b83a..3b0e4bc973b 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -34,7 +34,7 @@ jobs: path: ice - name: Call Build Debian Package Action - uses: ./.github/actions/build-deb-package + uses: ./ice/.github/actions/build-deb-package with: ice_version: ${{ inputs.ice_version }} deb_build_options: ${{ inputs.deb_build_options }}