Skip to content

Commit d2a8af0

Browse files
authored
Merge pull request #545 from diffblue/ebmc-packages-fixup3
Fix ebmc release workflow
2 parents 20b2ce9 + 770f368 commit d2a8af0

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

.github/workflows/ebmc-release.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525

2626
perform-draft-release:
2727
name: Perform Draft Release
28+
id: draft_release
2829
runs-on: ubuntu-20.04
2930
needs: [get-version-information]
3031
steps:
@@ -42,6 +43,7 @@ jobs:
4243
ubuntu-22_04-package:
4344
name: Package for Ubuntu 22.04
4445
runs-on: ubuntu-22.04
46+
needs: [perform-draft-release]
4547
steps:
4648
- uses: actions/checkout@v4
4749
with:
@@ -95,24 +97,20 @@ jobs:
9597
deb_package_name="$(ls *.deb)"
9698
echo "deb_package=./build/$deb_package_name" >> $GITHUB_OUTPUT
9799
echo "deb_package_name=ubuntu-22.04-$deb_package_name" >> $GITHUB_OUTPUT
98-
- name: Get release info
99-
id: get_release_info
100-
uses: bruceadams/get-release@v1.3.2
101-
env:
102-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103100
- name: Upload binary packages
104101
uses: actions/upload-release-asset@v1
105102
env:
106103
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
107104
with:
108-
upload_url: ${{ steps.get_release_info.outputs.upload_url }}
105+
upload_url: ${{ steps.draft_release.outputs.upload_url }}
109106
asset_path: ${{ steps.create_packages.outputs.deb_package }}
110107
asset_name: ${{ steps.create_packages.outputs.deb_package_name }}
111108
asset_content_type: application/x-deb
112109

113110
centos8-package:
114111
name: Package for CentOS 8
115112
runs-on: ubuntu-22.04
113+
needs: [perform-draft-release]
116114
container:
117115
image: centos:8
118116
steps:
@@ -152,6 +150,7 @@ jobs:
152150
- name: Create .rpm
153151
run: |
154152
VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3 | cut -d "-" -f 2)
153+
SRC=`pwd`
155154
rpmdev-setuptree
156155
157156
cat > ~/rpmbuild/SPECS/ebmc.spec << EOM
@@ -185,20 +184,18 @@ jobs:
185184
186185
echo Building ebmc-${VERSION}-1.x86_64.rpm
187186
(cd ~/rpmbuild/SPECS ; rpmbuild -v -bb ebmc.spec )
188-
- name: Get release info
189-
id: get_release_info
190-
uses: bruceadams/get-release@v1.3.2
191-
env:
192-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
187+
rpm_package_name=ebmc-${VERSION}-1.x86_64.rpm
188+
echo "rpm_package=~/rpmbuild/SPECS/$rpm_package_name" >> $GITHUB_OUTPUT
189+
echo "rpm_package_name=centos8-$rpm_package_name" >> $GITHUB_OUTPUT
193190
- name: Upload binary packages
194191
uses: actions/upload-release-asset@v1
195192
env:
196193
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
197194
with:
198-
upload_url: ${{ steps.get_release_info.outputs.upload_url }}
199-
asset_path: ${{ steps.create_packages.outputs.deb_package }}
200-
asset_name: ${{ steps.create_packages.outputs.deb_package_name }}
201-
asset_content_type: application/x-deb
195+
upload_url: ${{ steps.draft_release.outputs.upload_url }}
196+
asset_path: ${{ steps.create_packages.outputs.rpm_package }}
197+
asset_name: ${{ steps.create_packages.outputs.rpm_package_name }}
198+
asset_content_type: application/x-rpm
202199

203200
perform-release:
204201
name: Perform Release

0 commit comments

Comments
 (0)