Skip to content

Commit 46a351c

Browse files
authored
Merge pull request #672 from jmpsec/correct-deb-package-name
Skip adding the commit sha in DEB package
2 parents 7584a6f + 85f7341 commit 46a351c

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

.github/actions/build/dpkg/action.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ runs:
5555
package: osctrl-${{ inputs.osctrl_component }}
5656
package_root: ".debpkg-osctrl-${{ inputs.osctrl_component }}-${{ inputs.commit_sha }}-${{ inputs.go_os }}-${{ inputs.go_arch }}"
5757
maintainer: jmpsec/osctrl
58-
version: ${{ github.ref }} # refs/tags/v*.*.*
58+
version: ${{ inputs.release_version_tag }}
5959
arch: ${{ inputs.go_arch }}
6060
desc: "DEB package for osctrl-${OSCTRL_COMPONENT}-${OSCTRL_VERSION} Commit SHA: ${COMMIT_SHA}"
6161

@@ -71,11 +71,21 @@ runs:
7171
desc: "DEB package for osctrl-${OSCTRL_COMPONENT}-${OSCTRL_VERSION} Commit SHA: ${COMMIT_SHA}"
7272

7373
########################### Upload DEBs ###########################
74+
- name: Debug DEB package creation
75+
if: startsWith(github.ref, 'refs/tags/')
76+
run: |
77+
echo "DEB package file name: ${{ steps.create_deb_tagged_pkgs.outputs.file_name }}"
78+
echo "Release version tag: ${{ inputs.release_version_tag }}"
79+
echo "Component: ${{ inputs.osctrl_component }}"
80+
echo "Arch: ${{ inputs.go_arch }}"
81+
ls -la *.deb || echo "No DEB files found"
82+
shell: bash
83+
7484
- name: Upload osctrl DEBs for tagged version
7585
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7686
if: startsWith(github.ref, 'refs/tags/')
7787
with:
78-
name: osctrl-${{ inputs.osctrl_component }}_${{ inputs.release_version_tag }}-${{ inputs.commit_sha }}_${{ inputs.go_arch }}.deb
88+
name: osctrl-${{ inputs.osctrl_component }}_${{ inputs.release_version_tag }}_${{ inputs.go_arch }}.deb
7989
path: ${{ steps.create_deb_tagged_pkgs.outputs.file_name }}
8090
retention-days: 10
8191

.github/actions/tagged_release/github/action.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,20 @@ runs:
5151
osctrl-${{ inputs.osctrl_component }}-${{ inputs.release_version_tag }}-${{ inputs.go_os }}-${{ inputs.go_arch }}.exe
5252
5353
########################### Download osctrl DEB package ###########################
54+
- name: List available artifacts
55+
if: ${{ inputs.go_os }} == 'linux'
56+
run: |
57+
echo "Looking for DEB package: osctrl-${{ inputs.osctrl_component }}_${{ inputs.release_version_tag }}_${{ inputs.go_arch }}.deb"
58+
echo "Release version tag: ${{ inputs.release_version_tag }}"
59+
echo "Component: ${{ inputs.osctrl_component }}"
60+
echo "Arch: ${{ inputs.go_arch }}"
61+
shell: bash
62+
5463
- name: Download osctrl DEB package
5564
if: ${{ inputs.go_os }} == 'linux'
5665
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
5766
with:
58-
name: osctrl-${{ inputs.osctrl_component }}_${{ inputs.release_version_tag }}-${{ inputs.commit_sha }}_${{ inputs.go_arch }}.deb
59-
fail-on-not-found: false
60-
continue-on-error: true
67+
name: osctrl-${{ inputs.osctrl_component }}_${{ inputs.release_version_tag }}_${{ inputs.go_arch }}.deb
6168

6269
########################### Release ###########################
6370
- name: Release

0 commit comments

Comments
 (0)