From a4b9c3049bfcacd284c44fe15ea26850681af173 Mon Sep 17 00:00:00 2001 From: Mike Farah Date: Sat, 13 Apr 2024 11:00:39 +1000 Subject: [PATCH] Removed unused debian directory #2000 --- debian/changelog | 210 -------------------------------- debian/compat | 1 - debian/control | 22 ---- debian/copyright | 24 ---- debian/gbp.conf | 2 - debian/rules | 74 ----------- debian/source/format | 1 - debian/yq.dirs | 3 - pkg/yqlib/chown_not_linux_os.go | 2 +- 9 files changed, 1 insertion(+), 338 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gbp.conf delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/yq.dirs diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 5c73e194..00000000 --- a/debian/changelog +++ /dev/null @@ -1,210 +0,0 @@ -yq (4.16.2) focal; urgency=medium - - * Fixed with semicolon space issue - * Updating with documentation - * Added STDIN example to the top - * minor readme cleanup - * Help text tweak - * Fixed docker timeout - simplify docker builds - * New release with docker build fixes - * Updating to go 1.17 to fix CVE #944 - * Fix a typo in root.go - * Skip the tests if the nocheck Debian build option is specified - * Fixed select bug (#958) - * Sped up explode operator - * Slight performance improvement to context.ChildContext - * Speed up multiply - * Update README with recently added / changed options - * Make deepMatch report in linear time - * Removed leadingContentPreProcessing flag - header preprocessing is stable - * Revert "Removed leadingContentPreProcessing flag - header preprocessing is stable" - * Keep flag, it is needed in corner cases - * Updated Readme - * Man page - * Fixed expression parsing bug #970 - * Bumping go-lang, docker versions - * Added test release flow - * Updated github action release to generate man page - * Bumping version - * Removing no longer needed github action - * Added decoder op - * Fixed newline handling when decoding/encoding - * Fixed newline handling in encoder/decoder - * Can specify indent in encode ops - * Added group_by operator - * Added flatten operator - * Fixed flatten error message - * Improving docs - * Split printer - * Refactored command logic - * Fix JSON encoding removing null #985 - * Fixed acceptance tests - * gitbook - * Update document generation script - * Updating README - * Updating release instructions - * github action no longer uses data1.yml - * Create dependabot.yml - * Bump actions/create-release from 1.0.0 to 1.1.4 - * Bump actions/setup-go from 1 to 2.1.4 - * Bump github.com/goccy/go-yaml from 1.8.9 to 1.9.4 - * Bump github.com/jinzhu/copier from 0.2.8 to 0.3.2 - * Bump github.com/fatih/color from 1.10.0 to 1.13.0 - * Bump github.com/spf13/cobra from 1.1.3 to 1.2.1 - * Update dependabot.yml - * Update go.yml - * add build check to PRs - * Include secure as part of build process - * Fixing bad label in github action - * fixed printer test - * remove leading content indicator - * Fixed header preprocessing! - * lint : define golangci configuration file - * Update check.sh - * Load file acceptance test - * Minor improvement on handling front matter - * Improved load doc - * feature: detect MANPATh and install there - * Update install-man-page.sh - * simplify prod stage, move version label to action - * add labels, quote some values - * enable errorlint linter - * Added errorlint to devtools - * Added key operator - * Added more tests - * Fixing comments - * Attempt to fix golint problem - * Include version query for tools - * Clean up errored file? - * enable misspell linter - * updated readme - * update Golangci version to v1.43.0 - * gci linter - * Better merge array by key example - * Added credit for merge by array example - * Better formatting of merge arrays example - * Better merge example - * Add accessor for the yq logger instance (#1013) - * Fixed collect op when working with multiple nodes - * Added map, map_values - * Add support for Podman as well as Docker (#1026) - * Bump github.com/jinzhu/copier from 0.3.2 to 0.3.4 (#1027) - * Added csv, tsv output formats - * Added encoder tests - * Cleanup test - * Fixed docker permission issue #1014 - * Recording release notes for next release - * Assignment op no longer clobbers anchor (#1029) - * Added sort_by operator - * Improved error message - * Improved tips and tricks - * Report while filename failed to parse #1030 - * Added script for extracting checksums - * Improved extract-checksum.sh - * Bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (#1039) - * enable more linters (#1043) - * Bump Golang compiler #1037 - - -- Roberto Mier Escandon Tue, 21 Dec 2021 09:41:44 +0000 - -yq (4.13.0) focal; urgency=medium - - * New `with` operator for making multiple changes to a given path - * New `contains` operator, works like the `jq` equivalent - * Subtract operator now supports subtracting elements from arrays! - * Fixed Swapping values using variables #934 - * Github Action now properly supports multiline output #936, thanks @pjxiao - * Fixed missing closing bracket validation #932 - * Fix processing of hex numbers #929 - * Fixed alternative and union operator issues #930 - * Can now convert yaml to properties properties format (`-o=props`), See [docs](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties) for more info. - * Fixed document header/footer comment handling when merging (https://github.com/mikefarah/yq/issues/919) - * pretty print yaml 1.1 compatibility (https://github.com/mikefarah/yq/issues/914) - - -- Roberto Mier Escandon Thu, 16 Sep 2021 20:58:30 +0200 - -yq (4.9.6) focal; urgency=medium - - * Added darwin/arm64 build, thanks @alecthomas - * Incremented docker alpine base version, thanks @da6d6i7-bronga - * Bug fix: multiline expression - * Bug fix: special character - - -- Roberto Mier Escandon Tue, 29 Jun 2021 21:32:14 +0200 - -yq (3.3.2) focal; urgency=medium - - * Bug fix: existStatus bug (#459) - * Automatically makes an os temp directory if it does not exist (#461) - - -- Roberto Mier Escandon Fri, 07 Aug 2020 18:53:01 +0200 - -yq (3.3-0) focal; urgency=medium - - * You can control string styles (quotes) using the new --style flag - * String values now always have quotes when outputting to json - * Negative array indices now traverse the array backwards - * Added a --stripComments flag to print yaml without any comments - * Bumped go to version 1.14 - - -- Roberto Mier Escandon Thu, 30 Apr 2020 20:45:44 +0200 - -yq (3.1-2) eoan; urgency=medium - - * Bug fix: yq 3 was removing empty inline-style objects and arrays (#355) - * Bug fix: Merge option returned different output when switching order of - merging files(#347) - * Bug fix: Add new object to existing array object was failing in 3.1.1 (#361) - * Bug fix: yq 3 empty keys did not allow merging of values (#356) - * Bug fix: keys quoted during merge (#363) - * Bug fix: Correct length with wc -l (#362) - * Bug fix: Write to empty document removed path (#359) - - -- Roberto Mier Escandon Mon, 24 Feb 2020 20:31:58 +0100 - -yq (3.1-1) eoan; urgency=medium - - * Keeps yaml comments and formatting, can specify yaml tags when updating. - * Handles anchors - * Can print out matching paths and values when splatting - * JSON output works for all commands - * Yaml files with multiple documents are printed out as one JSON - document per line. - * Deep splat (**) to match arbitrary paths - * Update scripts file format has changed to be more powerful - * Reading and splatting, matching results are printed once per line - * Bugfixing - - -- Roberto Mier Escandon Tue, 11 Feb 2020 22:18:24 +0100 - -yq (2.2-1) bionic; urgency=medium - - * Added Windows support for the "--inplace" command flag - * Prefix now supports arrays - * Add prefix command - * Bump Alpine version to 3.8 - * Improved docker build process - * Lint fixes - * Build support for all linux architectures supported by gox - - -- Roberto Mier Escandon Sat, 19 Jan 2019 15:50:47 +0100 - -yq (2.1-0) bionic; urgency=medium - - * Ability to read multiple documents in a single file - * Ability to append list items instead of overwriting - - -- Roberto Mier Escandón Tue, 10 Jul 2018 14:02:42 +0200 - -yq (2.0-0) bionic; urgency=medium - - * Release 2.0.0 - - -- Roberto Mier Escandón Wed, 20 Jun 2018 10:29:53 +0200 - -yq (1.15-0) bionic; urgency=medium - - * Release 1.15 - - -- Roberto Mier Escandón Wed, 06 Jun 2018 11:32:03 +0200 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control deleted file mode 100644 index 767afca6..00000000 --- a/debian/control +++ /dev/null @@ -1,22 +0,0 @@ -Source: yq -Section: devel -Priority: optional -Maintainer: Roberto Mier Escandón -Build-Depends: debhelper (>=10), - golang-1.17-go, - pandoc, - rsync -Standards-Version: 4.1.4 -Homepage: https://github.com/mikefarah/yq.git -Vcs-Browser: https://github.com/mikefarah/yq.git -Vcs-Git: https://github.com/mikefarah/yq.git -XS-Go-Import-Path: github.com/mikefarah/yq -XSBC-Original-Maintainer: Roberto Mier Escandón - -Package: yq -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: lightweight and portable command-line data file processor - . - The aim of the project is to be the - [jq](https://github.com/stedolan/jq) or sed of yaml files. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index d3bbdc05..00000000 --- a/debian/copyright +++ /dev/null @@ -1,24 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: yq -Source: https://github.com/mikefarah/yq.git - -Files: * -Copyright: 2017 Mike Farah -License: Expat - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. \ No newline at end of file diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index cec628c7..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -pristine-tar = True diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 4c40d6db..00000000 --- a/debian/rules +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/make -f -# -# Copyright (C) 2018-2021 Roberto Mier Escandón -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -PROJECT := yq -OWNER := mikefarah -REPO := github.com - -export DH_OPTIONS -export DH_GOPKG := ${REPO}/${OWNER}/${PROJECT} -export GOROOT := /usr/local/go -export GOPATH := ${CURDIR}/_build -export GOBIN := ${GOPATH}/bin -export PATH := ${GOROOT}/bin:${GOBIN}:${PATH} -export GOCACHE := /tmp/gocache -export GOFLAGS := -mod=vendor -export GO111MODULE := on - -SRCDIR := ${GOPATH}/src/${DH_GOPKG} -DESTDIR := ${CURDIR}/debian/${PROJECT} -BINDIR := /usr/bin -MANDIR := /usr/share/man/man1/ -ASSETSDIR := /usr/share/${PROJECT} - -%: - dh $@ - -override_dh_auto_build: - mkdir -p ${SRCDIR} - mkdir -p ${GOBIN} - # copy project to local srcdir to build from there - rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod --exclude=docs . $(SRCDIR) - # build go code - ( \ - cd ${SRCDIR} && \ - go install -buildmode=pie ./... \ - ) - - # build man page - ( \ - cd ${SRCDIR} && \ - ./scripts/generate-man-page-md.sh && \ - ./scripts/generate-man-page.sh \ - ) - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - (cd ${SRCDIR} && go test -v ./...) -endif - -override_dh_auto_install: - cp ${GOBIN}/yq ${DESTDIR}/${BINDIR} - cp -f ${SRCDIR}/LICENSE ${DESTDIR}/${ASSETSDIR} - chmod a+x ${DESTDIR}/${BINDIR}/yq - - # man - mkdir -p "${DESTDIR}"/"${MANDIR}" - cp "${SRCDIR}"/yq.1 "${DESTDIR}"/"${MANDIR}" \ - -override_dh_auto_clean: - dh_clean - rm -rf ${CURDIR}/_build diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db8..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/debian/yq.dirs b/debian/yq.dirs deleted file mode 100644 index ccf6e913..00000000 --- a/debian/yq.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/yq -usr/share/man/man1 \ No newline at end of file diff --git a/pkg/yqlib/chown_not_linux_os.go b/pkg/yqlib/chown_not_linux_os.go index 3675791a..c82c3d7b 100644 --- a/pkg/yqlib/chown_not_linux_os.go +++ b/pkg/yqlib/chown_not_linux_os.go @@ -7,6 +7,6 @@ import ( "os" ) -func changeOwner(info fs.FileInfo, file *os.File) error { +func changeOwner(_ fs.FileInfo, _ *os.File) error { return nil }