diff --git a/.gitignore b/.gitignore index 51a7605..b1eca1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/gpg-117E8C168EFE3A7F.key -SOURCES/weldr-client-35.1.tar.gz +SOURCES/weldr-client-35.5.tar.gz diff --git a/.weldr-client.metadata b/.weldr-client.metadata index 0cc9acf..dbe2dd5 100644 --- a/.weldr-client.metadata +++ b/.weldr-client.metadata @@ -1,2 +1,2 @@ -7236a544c634e1f248d2cea7b52e1b5dc50727ff SOURCES/gpg-117E8C168EFE3A7F.key -c0c0422eec75a0b5409c5aa5147cc796a8043008 SOURCES/weldr-client-35.1.tar.gz +9a95f2c777b4fca2c9c5705ed330cafcf1b09555 SOURCES/gpg-117E8C168EFE3A7F.key +089128c30d8aa218304d0bb8d571f9a6d45aba72 SOURCES/weldr-client-35.5.tar.gz diff --git a/SOURCES/weldr-client-35.1.tar.gz.asc b/SOURCES/weldr-client-35.1.tar.gz.asc deleted file mode 100644 index df7d102..0000000 --- a/SOURCES/weldr-client-35.1.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmB0v1oACgkQEX6MFo7+ -On/fBQgAheXV7RRzQEKiYTc53dNKY2+jTzy++W2BpBnpMVIkcu8LjSLQ9sD2AF5o -90aeeTnMs4o2YKjInj2Rl/TfnA0JfHl+es/QcpKwM6Tl7Znn9570hRy10JuRojSe -4Lq8wxcr8m5oxAzE1UAvz4ws0xdgHwvhPJJUfMNXANj5BX7M/5A3493zDAkwvQ9H -3VdPenPgZk2nwjml0IgtTR+sRn1aJC0yXYtcP2bAlOV3sAklVkIGhL3E9bh78Bbj -oRCN50Bw3jrFmhisfT1HhKtW0B64mg12uIXAqi0S471O4eiy4cF6SFh9L5bSqaTZ -Zw1nTyzykUR0DCtQ6n/Vcqo7jl8Fsw== -=YWa+ ------END PGP SIGNATURE----- diff --git a/SOURCES/weldr-client-35.5.tar.gz.asc b/SOURCES/weldr-client-35.5.tar.gz.asc new file mode 100644 index 0000000..f3bfd06 --- /dev/null +++ b/SOURCES/weldr-client-35.5.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmIK0YcACgkQEX6MFo7+ +On8CfAf7BSNtG3oQKc9KxmN+D7hS/IHliKpAWRhF+kNZDshytLZeISuB8yjDlXJ8 +LMVifzmkumoZTwYsk74TGJjL/j/wTo6RAE5+OEIQIftvidihahNUH5WM6XrbSVAA +ygB3NgrhaGTnk8TRHNNnY26CJ6drY6MTNB3V+JFXtVlx/EgH+LHHLrXOA6f5I+3h +TKMzxJOXgXb1yDrSdVJYj1IToGmwT+QsiCmzciYCykshRaoe9hGfrDPoC4xGjdVx +OreX9x/tmPuPqQhXK40CqVX2rGMzjMf78/01dDiWHatOKepHdGy0N7VFwLQ8/f0Q +QD0Yq3i0JMzzS28NAszNdQdIeAD7BA== +=A1hY +-----END PGP SIGNATURE----- diff --git a/SPECS/weldr-client.spec b/SPECS/weldr-client.spec index d05a515..10ed745 100644 --- a/SPECS/weldr-client.spec +++ b/SPECS/weldr-client.spec @@ -1,18 +1,22 @@ # Pass --with tests to rpmbuild to build composer-cli-tests %bcond_with tests +# Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION) +%bcond_without signed -%global goipath github.com/osbuild/weldr-client +%global goipath github.com/osbuild/weldr-client/v2 Name: weldr-client -Version: 35.1 -Release: 4%{?dist} +Version: 35.5 +Release: 2%{?dist} # Upstream license specification: Apache-2.0 License: ASL 2.0 Summary: Command line utility to control osbuild-composer Url: %{gourl} Source0: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz +%if %{with signed} Source1: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key +%endif Obsoletes: composer-cli < 35.0 Provides: composer-cli = %{version}-%{release} @@ -37,7 +41,9 @@ BuildRequires: gnupg2 Command line utility to control osbuild-composer %prep +%if %{with signed} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%endif %if 0%{?rhel} %forgeautosetup -p1 %else @@ -45,6 +51,8 @@ Command line utility to control osbuild-composer %endif %build +export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} " + %if 0%{?rhel} GO_BUILD_PATH=$PWD/_build install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath}) @@ -58,28 +66,23 @@ export GOFLAGS=-mod=vendor export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}" export GO111MODULE=off %endif +%gobuild -o composer-cli %{goipath}/cmd/composer-cli -export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} " -make GOBUILDFLAGS="%{gobuildflags}" build ## TODO ##make man %if %{with tests} || 0%{?rhel} +export BUILDTAGS="integration" + # Build test binaries with `go test -c`, so that they can take advantage of -# golang's testing package. The golang rpm macros don't support building them +# golang's testing package. The RHEL golang rpm macros don't support building them # directly. Thus, do it manually, taking care to also include a build id. # -# On Fedora, also turn off go modules and set the path to the one into which +# On Fedora go modules have already been turned off, and the path set to the one into which # the golang-* packages install source code. -%if 0%{?fedora} -export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}" -export GO111MODULE=off -%endif - -export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} " -export BUILDTAGS="integration" -make GOBUILDFLAGS="%{gobuildflags}" integration +export LDFLAGS="${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')" +go test -c -tags=integration -buildmode pie -compiler gc -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr %endif %install @@ -95,8 +98,10 @@ export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}" export GO111MODULE=off %endif -export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} " -make GOBUILDFLAGS="%{gotestflags}" test +# Run the unit tests +export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} " +make test + %files %license LICENSE @@ -121,32 +126,26 @@ composer-cli package. %changelog -* Tue Aug 10 2021 Mohan Boddu - 35.1-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Tue Jun 22 2021 Mohan Boddu - 35.1-3 -- Rebuilt for RHEL 9 BETA for openssl 3.0 - Related: rhbz#1971065 - -* Thu Apr 22 2021 Brian C. Lane - 35.1-2 -- Obsolete composer-cli < 35.0 instead of 34.0 - Patch until next upstream release - -* Mon Apr 12 2021 Brian C. Lane - 35.1-1 -- New release: 35.1 (bcl) -- spec: Change release back to 1 (bcl) -- spec: Move testify BuildRequires into fedora block (bcl) -- vendor: Add vendored dependencies for RHEL (bcl) -- tools: Add prepare-source.sh vendoring helper script (bcl) -- Makefile: skip vendor directory for check target (bcl) -- spec: Bump release to 2 (bcl) -- spec: Fix BuildRequires for tests (bcl) -- Makefile: Remove executable from bash completion (bcl) -- Makefile: Only use GOBUILDFLAGS (bcl) -- spec: Bump release to 2 (bcl) -- spec: Add doc files (bcl) -- spec: Add gpg signature verification (bcl) -- spec: Use git-core instead of git (bcl) -- spec: Set License to Apache 2.0 (bcl) -- spec: Update Source urls with new project location (bcl) +* Wed Feb 16 2022 Brian C. Lane - 35.5-2 +- Switch to tmt tests instead of STI and update repo urls + Related: rhbz#2052601 + +* Tue Feb 15 2022 Brian C. Lane - 35.5-1 +- New release: 35.5 (bcl) + Resolves: rhbz#2052601 +- docs: Explain how to undo blueprints delete (bcl) +- test: server status no longer returns devel (bcl) +- Use GetFrozenBlueprintsTOML for blueprints freeze save (bcl) +- Add a test for float uid/gid in frozen blueprint (bcl) +- Use GetBlueprintsTOML for blueprints save (bcl) +- test: Add a test for float uid/gid in saved blueprint (bcl) +- build(deps): bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0 (49699333+dependabot[bot]) +- tests: trigger on push to main (jrusz) +- build(deps): bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (49699333+dependabot[bot]) +- ci: add keystore for sonarqube (jrusz) +- spec: Switch to using %%gobuild macro on Fedora (bcl) +- ci: change workflow name (jrusz) +- ci: add gitlab-ci and sonarqube (jrusz) +- doc: fix example links from the README (tdecacqu) +- build(deps): bump actions/checkout from 2.3.4 to 2.4.0 (49699333+dependabot[bot]) +- ci: Enable Coverity Scan tool (atodorov)