doublejynx/jx
doublejynx/jx
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fix package rpmbuild name
Some checks failed
Lint / golangci-lint (push) Successful in 9m43s
Details
Declarative Tests / test (push) Successful in 20s
Details
Declarative Tests / build (push) Failing after 54s
Details

Browse Source
This commit is contained in:
Matthew Rich 2024-05-26 15:57:23 -07:00
parent 7991864bf4
commit 6480f793c4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/release.yaml
View File

@ -30,7 +30,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: echo "VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV - 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: dnf builddep -y build/jx.spec
- run: make rpm - run: make rpm
- uses: ncipollo/release-action@v1 - uses: ncipollo/release-action@v1

2
.gitea/workflows/test.yaml
View File

@ -78,7 +78,7 @@ jobs:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v3 uses: actions/checkout@v3
- run: echo "VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV - 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: dnf builddep -y build/jx.spec
- name: Run build - name: Run build
run: | run: |

5
Makefile
View File

@ -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')'" 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 export CGO_ENABLED=1
VERSION?=$(shell git describe --tags | sed -e 's/^v//')
.PHONY=jx-cli .PHONY=jx-cli
build: jx-cli build: jx-cli
@ -13,4 +13,5 @@ test: jx-cli
go tool cover -html=artifacts/coverage.profile -o artifacts/code-coverage.html go tool cover -html=artifacts/coverage.profile -o artifacts/code-coverage.html
rpm: 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

2
build/jx.spec
View File

@ -1,5 +1,5 @@
Name: jx Name: jx
Version: 0.2.2 Version: %{version}
Release: %{!?rel:1}%{?dist} Release: %{!?rel:1}%{?dist}
Summary: Provision resources using a declarative YAML syntax. Summary: Provision resources using a declarative YAML syntax.