diff --git a/.gitignore b/.gitignore index e45da98..b1eca1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/gpg-117E8C168EFE3A7F.key -SOURCES/weldr-client-35.3.tar.gz +SOURCES/weldr-client-35.5.tar.gz diff --git a/.weldr-client.metadata b/.weldr-client.metadata index 2d077e8..dbe2dd5 100644 --- a/.weldr-client.metadata +++ b/.weldr-client.metadata @@ -1,2 +1,2 @@ 9a95f2c777b4fca2c9c5705ed330cafcf1b09555 SOURCES/gpg-117E8C168EFE3A7F.key -f95b17a5cd86a460a24159f11fbee39c93f07e7b SOURCES/weldr-client-35.3.tar.gz +089128c30d8aa218304d0bb8d571f9a6d45aba72 SOURCES/weldr-client-35.5.tar.gz diff --git a/SOURCES/weldr-client-35.3.tar.gz.asc b/SOURCES/weldr-client-35.3.tar.gz.asc deleted file mode 100644 index 9ab0f1b..0000000 --- a/SOURCES/weldr-client-35.3.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmFbaz0ACgkQEX6MFo7+ -On+dJggAnqHXnES3vnUdQl8mvQspCJOLab4WPnl+DZnq4UsYEjM3IQo56uyU4UQt -eUMQ+N7/YGG5B5Uo2vZdujCs0eoRpEKa1vVEvD6+EE4KWlOQh9bQmiECTb7qClEv -1PP8XWrw16p4etDwObj5joSCheoUw8A9t9CS+dQ52RZAnvTMF+sbYlON51GguvQe -7HlbKf/xPMzWqBVXXjXt1TssAOReGHy6wCmY5ElhnIB5EuMGHi8VqCmAowBZk2Vh -chS+i60ebZm7XfbHwCgR406VFrpLEfeBn/jUFxND0faxiK571RJ7/43L7+Ffqnkn -azi+sdGDmHQ9KTXyL3OGOhZ59ZPy1Q== -=jQtK ------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 166beba..1a35b6b 100644 --- a/SPECS/weldr-client.spec +++ b/SPECS/weldr-client.spec @@ -6,8 +6,8 @@ %global goipath github.com/osbuild/weldr-client/v2 Name: weldr-client -Version: 35.3 -Release: 2%{?dist} +Version: 35.5 +Release: 1%{?dist} # Upstream license specification: Apache-2.0 License: ASL 2.0 Summary: Command line utility to control osbuild-composer @@ -62,12 +62,11 @@ install -m 0755 -vd _bin export PATH=$PWD/_bin${PATH:+:$PATH} export GOPATH=$GO_BUILD_PATH:%{gopath} export GOFLAGS=-mod=vendor -%gobuild -o composer-cli %{goipath}/cmd/composer-cli %else export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}" export GO111MODULE=off -make GOBUILDFLAGS="%{gobuildflags}" build %endif +%gobuild -o composer-cli %{goipath}/cmd/composer-cli ## TODO @@ -80,14 +79,10 @@ export BUILDTAGS="integration" # 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%{?rhel} 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 -%else -make GOBUILDFLAGS="%{gobuildflags}" integration -%endif %endif %install @@ -131,44 +126,22 @@ composer-cli package. %changelog -* Mon Oct 04 2021 Brian C. Lane - 35.3-1 -- New release: 35.3 (bcl) -- spec: Adjust build methods for RHEL 8 (bcl) -- github: Run build-in-podman to test building package (bcl) -- spec: Use v2 module (bcl) -- Makefile: Use v2 module (bcl) -- Makefile: Add a build-in-podman target (bcl) -- tests: Add JSON and error result testing to status (bcl) -- tests: Add JSON and error result testing to sources (bcl) -- tests: Add JSON and error result testing to projects (bcl) -- tests: Add JSON and error result testing to modules (bcl) -- tests: Add JSON and error result testing to distros (bcl) -- tests: Add JSON and error result testing to compose (bcl) -- tests: Add JSON and error result testing to blueprints (bcl) -- test: Fix test client setup and output capture code (bcl) -- test: Close output capture in printwrap_test (bcl) -- test: reset the root flags on every ExecuteTest call (bcl) -- status: Use ExecutionErrors for API errors (bcl) -- sources: Use ExecutionErrors for API errors (bcl) -- projects: Use ExecutionErrors for API errors (bcl) -- modules: Use ExecutionErrors for API errors (bcl) -- distros: Use ExecutionErrors for API errors (bcl) -- compose: Use ExecutionErrors for API errors (bcl) -- blueprints: Use ExecutionErrors for API errors (bcl) -- composer-cli: Turn off normal command Stdout when --json is used (bcl) -- weldr: Fix Stringer interface on API messages (bcl) -- weldr: Clean up error message return code (bcl) -- weldr: Move Unmarshal error to error position (bcl) -- root: Add a helper function to print a list of errors (bcl) -- Use GetFilePath for ComposeImage (bcl) -- Use GetFilePath for ComposeResults (bcl) -- Use GetFilePath for ComposerMetadata (bcl) -- Use GetFilePath for ComposeLogs (bcl) -- weldr: Add GetFilePath to download a file to a path (bcl) -- Creating v2 module for breaking API changes (bcl) -- Makefile: Add update-mods target (bcl) -- vendor: Update the modules and vendor directory (bcl) -- Bump go version to 1.15 (bcl) -- Limit dependabot to 1 PR (bcl) -- Enable Dependabot service (atodorov) -- tests: Fix integration tests (bcl) +* Tue Feb 15 2022 Brian C. Lane - 35.5-1 +- New release: 35.5 (bcl) + Resolves: rhbz#2052604 +- 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)