Skip to content

Commit

Permalink
Merge pull request #8545 from inverse-inc/fix/githab-workflow-v3-to-v4
Browse files Browse the repository at this point in the history
Fix/githab workflow v3 to v4
  • Loading branch information
JeGoi authored Feb 10, 2025
2 parents 8cf417e + 1aa46f1 commit 2365f98
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main_packetfence-perl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
regex: '^(maintenance\/1[1-9].[0-2]|devel)$'

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: dorny/paths-filter@v2
id: filters
Expand Down Expand Up @@ -118,4 +118,4 @@ jobs:
_VOLUME_MOUNT: ${{needs.build_preparation.outputs.volume_mount}}
_BRANCH_NAME: ${{ needs.build_preparation.outputs.branch_name }}
_PACKAGE_NAME: ${{ needs.build_preparation.outputs.package_name }}
secrets: inherit
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/main_perl-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
regex: '^(maintenance\/1[1-9].[0-2]|devel)$'

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: dorny/paths-filter@v2
id: filters
Expand Down Expand Up @@ -115,4 +115,4 @@ jobs:
_VOLUME_MOUNT: ${{needs.build_preparation.outputs.volume_mount}}
_BRANCH_NAME: ${{ needs.build_preparation.outputs.branch_name }}
_PACKAGE_NAME: ${{ needs.build_preparation.outputs.package_name }}
secrets: inherit
secrets: inherit
3 changes: 2 additions & 1 deletion .github/workflows/packetfence-perl_build_image_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -105,6 +105,7 @@ jobs:
with:
name: ${{ env.ARTIFACTORY_NAME }}
path: ${{ inputs._OUTPUT_DIRECTORY }}/${{ env.PATH_PACKAGE }}/packages/${{ env.PACKAGE_NAME }}
overwrite: true
env:
PACKAGE_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'packetfence-perl-*.rpm' || inputs._IMAGE_TYPE == 'debian11' && 'packetfence-perl*.deb' || inputs._IMAGE_TYPE == 'debian12' && 'packetfence-perl*.deb' }}
ARTIFACTORY_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'package-rpm8' || inputs._IMAGE_TYPE == 'debian11' && 'package-deb11' || inputs._IMAGE_TYPE == 'debian12' && 'package-deb12' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/perl-client_build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: package-build
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

build_package:
runs-on: package-build
Expand Down Expand Up @@ -75,6 +75,7 @@ jobs:
name: ${{ env.ARTIFACTORY_NAME }}
# path: /__w/packetfence/packetfence/addons/perl-client/result/${{ inputs._IMAGE_TYPE == 'rhel8' && 'centos/8' || inputs._IMAGE_TYPE == 'debian11' && 'debian/bookworm'}}/${{ env.PACKAGE_NAME }}
path: /mnt/packetfence/addons/perl-client/result/${{ inputs._IMAGE_TYPE == 'rhel8' && 'centos/8' || inputs._IMAGE_TYPE == 'debian11' && 'debian/bullseye' || inputs._IMAGE_TYPE == 'debian12' && 'debian/bookworm'}}/${{ env.PACKAGE_NAME }}
overwrite: true
env:
PACKAGE_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'fingerbank-*.noarch.rpm' || inputs._IMAGE_TYPE == 'debian11' && 'fingerbank*.deb' || inputs._IMAGE_TYPE == 'debian12' && 'fingerbank*.deb' }}
ARTIFACTORY_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'package-rpm8' || inputs._IMAGE_TYPE == 'debian11' && 'package-deb11' || inputs._IMAGE_TYPE == 'debian12' && 'package-deb12' }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/reusable_sign_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ jobs:
dpkg-sig --list /mnt/${{ inputs._PACKAGE_NAME }}*.deb
- name: Upload the package to artifactory ${{inputs._IMAGE_TYPE}}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACTORY_NAME }}
path: /mnt/${{ env.PACKAGE_NAME }}
overwrite: true
env:
PACKAGE_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && env.RPM_FORMAT_PACKAGE_NAME || env.DEB_FORMAT_PACKAGE_NAME }}
ARTIFACTORY_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'package-rpm8' || inputs._IMAGE_TYPE == 'debian11' && 'package-deb11' || inputs._IMAGE_TYPE == 'debian12' && 'package-deb12' }}
Expand Down Expand Up @@ -98,10 +99,11 @@ jobs:
rpm --checksig /mnt/${{ inputs._PACKAGE_NAME }}**.rpm
- name: Upload the package to artifactory ${{inputs._IMAGE_TYPE}}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACTORY_NAME }}
path: /mnt/${{ env.PACKAGE_NAME }}
overwrite: true
env:
PACKAGE_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && env.RPM_FORMAT_PACKAGE_NAME || env.DEB_FORMAT_PACKAGE_NAME }}
ARTIFACTORY_NAME: ${{ inputs._IMAGE_TYPE == 'rhel8' && 'package-rpm8' || inputs._IMAGE_TYPE == 'debian11' && 'package-deb11' || inputs._IMAGE_TYPE == 'debian12' && 'package-deb12' }}
Expand Down

0 comments on commit 2365f98

Please sign in to comment.