fix package rpmbuild name
This commit is contained in:
parent
7991864bf4
commit
6480f793c4
@ -30,7 +30,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: echo "VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
|
||||
- run: dnf install -y dnf-plugins-core rpmbuild rpmdevtools
|
||||
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
||||
- run: dnf builddep -y build/jx.spec
|
||||
- run: make rpm
|
||||
- uses: ncipollo/release-action@v1
|
||||
|
@ -78,7 +78,7 @@ jobs:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v3
|
||||
- run: echo "VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
|
||||
- run: dnf install -y dnf-plugins-core rpmbuild rpmdevtools
|
||||
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
||||
- run: dnf builddep -y build/jx.spec
|
||||
- name: Run build
|
||||
run: |
|
||||
|
5
Makefile
5
Makefile
@ -1,6 +1,6 @@
|
||||
LDFLAGS?=--ldflags '-extldflags "-static"' --ldflags="-X 'main.commit=$(shell git rev-parse HEAD)' -X 'main.version=$(shell git describe --tags)' -X 'main.date=$(shell date '+%Y-%m-%d %T.%s%z')'"
|
||||
export CGO_ENABLED=1
|
||||
|
||||
VERSION?=$(shell git describe --tags | sed -e 's/^v//')
|
||||
.PHONY=jx-cli
|
||||
|
||||
build: jx-cli
|
||||
@ -13,4 +13,5 @@ test: jx-cli
|
||||
go tool cover -html=artifacts/coverage.profile -o artifacts/code-coverage.html
|
||||
|
||||
rpm:
|
||||
rpmbuild -ba build/jx.spec
|
||||
dnf install -y nodejs git dnf-plugins-core rpm-build rpmdevtools
|
||||
rpmbuild -ba --define='version $(VERSION)' build/jx.spec
|
||||
|
@ -1,5 +1,5 @@
|
||||
Name: jx
|
||||
Version: 0.2.2
|
||||
Version: %{version}
|
||||
Release: %{!?rel:1}%{?dist}
|
||||
Summary: Provision resources using a declarative YAML syntax.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user