Skip to content

Commit 9a016fc

Browse files
committed
Fix ebmc release workflow
* CentOS package creation step now has ID * Fix for asset_path for Debian package build step
1 parent 613df4e commit 9a016fc

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/ebmc-release.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
runs-on: ubuntu-20.04
1212
outputs:
1313
version: ${{ steps.split-version.outputs._1 }}
14+
tag_name: ebmc-${{ steps.split-version.outputs._1 }}
1415
steps:
1516
- uses: jungwinter/split@v2
1617
id: split-ref
@@ -79,7 +80,7 @@ jobs:
7980
run: make -C regression/verilog test
8081
- name: Print ccache stats
8182
run: ccache -s
82-
- name: Create packages
83+
- name: Create .deb
8384
id: create_packages
8485
run: |
8586
VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3 | cut -d "-" -f 2)
@@ -99,15 +100,15 @@ jobs:
99100
sudo chown root:root -R ebmc-${VERSION}
100101
dpkg -b ebmc-${VERSION}
101102
deb_package_name="$(ls *.deb)"
102-
echo "deb_package=./build/$deb_package_name" >> $GITHUB_OUTPUT
103+
echo "deb_package_path=$PWD/$deb_package_name" >> $GITHUB_OUTPUT
103104
echo "deb_package_name=ubuntu-22.04-$deb_package_name" >> $GITHUB_OUTPUT
104105
- name: Upload binary packages
105106
uses: actions/upload-release-asset@v1
106107
env:
107108
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108109
with:
109110
upload_url: ${{ needs.perform-draft-release.outputs.upload_url }}
110-
asset_path: ${{ steps.create_packages.outputs.deb_package }}
111+
asset_path: ${{ steps.create_packages.outputs.deb_package_path }}
111112
asset_name: ${{ steps.create_packages.outputs.deb_package_name }}
112113
asset_content_type: application/x-deb
113114

@@ -154,6 +155,7 @@ jobs:
154155
- name: Run the verilog tests
155156
run: make -C regression/verilog test
156157
- name: Create .rpm
158+
id: create_packages
157159
run: |
158160
VERSION=$(echo ${{ github.ref }} | cut -d "/" -f 3 | cut -d "-" -f 2)
159161
SRC=`pwd`
@@ -187,19 +189,18 @@ jobs:
187189
%files
188190
/usr/bin/ebmc
189191
EOM
190-
191192
echo Building ebmc-${VERSION}-1.x86_64.rpm
192193
(cd ~/rpmbuild/SPECS ; rpmbuild -v -bb ebmc.spec )
193194
rpm_package_name=ebmc-${VERSION}-1.x86_64.rpm
194-
echo "rpm_package=~/rpmbuild/SPECS/$rpm_package_name" >> $GITHUB_OUTPUT
195+
echo "rpm_package_path=~/rpmbuild/SPECS/$rpm_package_name" >> $GITHUB_OUTPUT
195196
echo "rpm_package_name=centos8-$rpm_package_name" >> $GITHUB_OUTPUT
196197
- name: Upload binary packages
197198
uses: actions/upload-release-asset@v1
198199
env:
199200
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
200201
with:
201202
upload_url: ${{ needs.perform-draft-release.outputs.upload_url }}
202-
asset_path: ${{ steps.create_packages.outputs.rpm_package }}
203+
asset_path: ${{ steps.create_packages.outputs.rpm_package_path }}
203204
asset_name: ${{ steps.create_packages.outputs.rpm_package_name }}
204205
asset_content_type: application/x-rpm
205206

@@ -227,6 +228,7 @@ jobs:
227228
228229
```sh
229230
dpkg -i ubuntu-22.04-ebmc-${{ env.EBMC_VERSION }}-Linux.deb
231+
${{ needs.ubuntu-22_04-package.outputs.deb_package_name }}
230232
```
231233
232234
## CentOS

0 commit comments

Comments
 (0)