Skip to content

Commit e658af9

Browse files
authored
chore(GHA/publish-release-artifacts) merge into a single package for RH/SuSE (#11299)
* chore(GHA/publish-release-artifacts) merge into a single package for RH/SuSE Ref. jenkinsci/packaging#430 for details this change updates the artifacts upload GHA workflow to merge the Redhat and OpenSuse packages into a single unified RPM package * Update .github/workflows/publish-release-artifact.yml
1 parent 28f6320 commit e658af9

File tree

1 file changed

+4
-39
lines changed

1 file changed

+4
-39
lines changed

.github/workflows/publish-release-artifact.yml

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115115
with:
116116
files: ${{ steps.fetch-deb.outputs.file-name }}
117-
redhat:
117+
rpm:
118118
permissions:
119119
contents: write # to upload release asset (softprops/action-gh-release)
120120

@@ -128,15 +128,16 @@ jobs:
128128
run: |
129129
PROJECT_VERSION=${{ needs.determine-version.outputs.project-version }}
130130
echo $PROJECT_VERSION
131-
FILE_NAME=jenkins-${PROJECT_VERSION}-1.1.noarch.rpm
131+
FILE_NAME=jenkins-${PROJECT_VERSION}-1.noarch.rpm
132132
IS_LTS=${{ needs.determine-version.outputs.is-lts }}
133133
134134
echo "file-name=$FILE_NAME" >> $GITHUB_OUTPUT
135135
136-
REPO=redhat
136+
REPO=rpm
137137
if [ ${IS_LTS} = 'true' ]
138138
then
139139
REPO=redhat-stable
140+
FILE_NAME=jenkins-${PROJECT_VERSION}-1.1.noarch.rpm
140141
fi
141142
142143
echo $REPO
@@ -186,39 +187,3 @@ jobs:
186187
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
187188
with:
188189
files: ${{ steps.fetch-msi.outputs.file-name }}
189-
suse:
190-
permissions:
191-
contents: write # to upload release asset (softprops/action-gh-release)
192-
193-
runs-on: ubuntu-latest
194-
needs: determine-version
195-
if: ${{ needs.determine-version.outputs.is-rc == 'false' }}
196-
steps:
197-
- name: Fetch suse rpm
198-
id: fetch-suse-rpm
199-
if: always()
200-
run: |
201-
PROJECT_VERSION=${{ needs.determine-version.outputs.project-version }}
202-
echo $PROJECT_VERSION
203-
# we need opensuse to the file
204-
OUTPUT_FILE_NAME=jenkins-${PROJECT_VERSION}-1.2-opensuse.noarch.rpm
205-
IS_LTS=${{ needs.determine-version.outputs.is-lts }}
206-
echo "file-name=$OUTPUT_FILE_NAME" >> $GITHUB_OUTPUT
207-
208-
REPO=opensuse
209-
if [ ${IS_LTS} = 'true' ]
210-
then
211-
REPO=opensuse-stable
212-
fi
213-
214-
echo $REPO
215-
216-
wget -q https://get.jenkins.io/${REPO}/jenkins-${PROJECT_VERSION}-1.2.noarch.rpm -O ${OUTPUT_FILE_NAME}
217-
- name: Upload Release Asset
218-
id: upload-suse-rpm
219-
if: always()
220-
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
221-
env:
222-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
223-
with:
224-
files: ${{ steps.fetch-suse-rpm.outputs.file-name }}

0 commit comments

Comments
 (0)