@@ -64,29 +64,38 @@ runs:
6464 env :
6565 RPM_GPG_SIGNING_KEY_ID : ${{ inputs.rpm_gpg_signing_key_id }}
6666 RPM_GPG_SIGNING_PASSPHRASE : ${{ inputs.rpm_gpg_signing_passphrase }}
67+ INPUT_VERSION : ${{ inputs.version }}
68+ MAJOR_VERSION : ${{ inputs.major_version }}
69+ MINOR_VERSION : ${{ inputs.minor_version }}
70+ INPUT_RELEASE : ${{ inputs.release }}
71+ ARCH : ${{ inputs.arch }}
72+ PACKAGE_EXTENSION : ${{ inputs.package_extension }}
73+ DISTRIB : ${{ inputs.distrib }}
74+ STABILITY : ${{ inputs.stability }}
75+ PKG_DISTRIB_SEPARATOR : ${{ steps.parse-distrib.outputs.package_distrib_separator }}
76+ PKG_DISTRIB_NAME : ${{ steps.parse-distrib.outputs.package_distrib_name }}
77+ NFPM_FILE_PATTERN : ${{ inputs.nfpm_file_pattern }}
78+ COMMIT_HASH : ${{ inputs.commit_hash }}
6779 run : |
68- if [ -z ${{ inputs.version }} ]; then
69- export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}"
70- export MAJOR_VERSION="${{ inputs.major_version }}"
71- export MINOR_VERSION="${{ inputs.minor_version }}"
72- elif [ -z ${{ inputs.major_version }} ]; then
73- export VERSION="${{ inputs.version }}"
80+ if [ -z $INPUT_VERSION ]; then
81+ export VERSION="${MAJOR_VERSION}.${MINOR_VERSION}"
82+ elif [ -z $MAJOR_VERSION ]; then
83+ export VERSION="${INPUT_VERSION}"
7484 export MAJOR_VERSION=$( echo $VERSION | cut -d "-" -f1 )
7585 export MINOR_VERSION=$( echo $VERSION | cut -d "-" -f2 )
7686 fi
77- export RELEASE="${{ inputs.release }}"
78- export ARCH="${{ inputs.arch }}"
87+ export RELEASE="${INPUT_RELEASE}"
7988
80- if [ "${{ inputs.package_extension }} " = "rpm" ]; then
81- export DIST=".${{ inputs.distrib }} "
89+ if [ "$PACKAGE_EXTENSION " = "rpm" ]; then
90+ export DIST=".$DISTRIB "
8291 export APACHE_USER="apache"
8392 export APACHE_GROUP="apache"
8493 else
8594 export DIST=""
86- if [ "${{ inputs.stability }} " == "unstable" ] || [ "${{ inputs.stability }} " == "canary" ]; then
87- export RELEASE="$RELEASE${{ steps.parse-distrib.outputs.package_distrib_separator }}${{ steps.parse-distrib.outputs.package_distrib_name } }"
95+ if [ "$STABILITY " == "unstable" ] || [ "$STABILITY " == "canary" ]; then
96+ export RELEASE="$RELEASE${PKG_DISTRIB_SEPARATOR}${PKG_DISTRIB_NAME }"
8897 else
89- export RELEASE="1${{ steps.parse-distrib.outputs.package_distrib_separator }}${{ steps.parse-distrib.outputs.package_distrib_name } }"
98+ export RELEASE="1${PKG_DISTRIB_SEPARATOR}${PKG_DISTRIB_NAME }"
9099 fi
91100 export APACHE_USER="www-data"
92101 export APACHE_GROUP="www-data"
@@ -109,28 +118,28 @@ runs:
109118 export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID"
110119 export NFPM_RPM_PASSPHRASE="$RPM_GPG_SIGNING_PASSPHRASE"
111120
112- for FILE in ${{ inputs.nfpm_file_pattern }} ; do
121+ for FILE in $NFPM_FILE_PATTERN ; do
113122 DIRNAME=$(dirname $FILE)
114123 BASENAME=$(basename $FILE)
115124 cd $DIRNAME
116125 sed -i "s/@APACHE_USER@/$APACHE_USER/g" $BASENAME
117126 sed -i "s/@APACHE_GROUP@/$APACHE_GROUP/g" $BASENAME
118- sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }} /g" $BASENAME
119- nfpm package --config $BASENAME --packager ${{ inputs.package_extension }}
127+ sed -i "s/@COMMIT_HASH@/$COMMIT_HASH /g" $BASENAME
128+ nfpm package --config $BASENAME --packager $PACKAGE_EXTENSION
120129 cd -
121- mv $DIRNAME/*.${{ inputs.package_extension }} ./
130+ mv $DIRNAME/*.$PACKAGE_EXTENSION ./
122131 done
123132 shell : bash
124133
125- - uses : actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
134+ - uses : actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
126135 with :
127136 path : ./*.${{ inputs.package_extension }}
128137 key : ${{ inputs.cache_key }}
129138
130139 # Add to your PR the label upload-artifacts to get packages as artifacts
131140 - if : ${{ contains(github.event.pull_request.labels.*.name, 'upload-artifacts') }}
132141 name : Upload package artifacts
133- uses : actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 .0.0
142+ uses : actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 .0.0
134143 with :
135144 name : packages-${{ inputs.distrib }}
136145 path : ./*.${{ inputs.package_extension}}
0 commit comments