Skip to content

Commit

Permalink
just have x86 do the build
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Richter <[email protected]>
  • Loading branch information
erichte-ibm committed Aug 30, 2023
1 parent 53d157e commit 43399f5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,9 @@ jobs:
- name: download rpms
uses: actions/download-artifact@v3

- name: copy artifacts
run: mkdir -p rpms && cp */*.rpm rpms/

- name: generate release
uses: softprops/action-gh-release@v1
with:
prerelease: ${{ contains(fromJSON('["rc", "alpha", "beta"]'), github.ref_name) }}
files: |
rpms/*.rpm
*/*.rpm
13 changes: 11 additions & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,19 @@ mkdir -p /root/rpmbuild/SOURCES
cp secvarctl-${VERSION}.tar.gz /root/rpmbuild/SOURCES

# Run Build
rpmbuild -ba secvarctl.spec
if [[ "x86_64" == $(uname -m) ]]; then
# Only one srpm is needed, so just arbitrarily pick the faster x86_64 build to do it
rpmbuild -ba secvarctl.spec
else
rpmbuild -bb secvarctl.spec
fi

# Move generated RPMs out of container
mkdir -p rpms
cp /root/rpmbuild/RPMS/*/*.rpm rpms/
cp /root/rpmbuild/SRPMS/*.rpm rpms/
if [[ "x86_64" == $(uname -m) ]]; then
# Only the x86_64 build generates the srpm
cp /root/rpmbuild/SRPMS/*.rpm rpms/
fi

# Note: srpm s the same for all arches, so really only the first to complete needs to be done

0 comments on commit 43399f5

Please sign in to comment.