Merge 9883ebc313 into ba1b9737b6

.github/workflows/docker-release.yml

@@ -30,19 +30,6 @@ jobs:
       - name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }} && docker version
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build and push image
         run: |
           echo "GithubRef: ${GITHUB_REF}"
@@ -54,6 +41,7 @@ jobs:
           PLATFORMS="linux/amd64,linux/ppc64le,linux/arm64,linux/arm/v7"
 
           echo "Building and pushing version ${IMAGE_VERSION} of image ${IMAGE_NAME}"
+          echo '${{ secrets.DOCKER_PASSWORD }}' | docker login -u '${{ secrets.DOCKER_USERNAME }}' --password-stdin
           docker buildx build \
             --label "org.opencontainers.image.authors=https://github.com/mikefarah/yq/graphs/contributors" \
             --label "org.opencontainers.image.created=$(date --rfc-3339=seconds)" \
@@ -71,9 +59,6 @@ jobs:
             -t "${IMAGE_NAME}:${IMAGE_VERSION}" \
             -t "${IMAGE_NAME}:4" \
             -t "${IMAGE_NAME}:latest" \
-            -t "ghcr.io/${IMAGE_NAME}:${IMAGE_VERSION}" \
-            -t "ghcr.io/${IMAGE_NAME}:4" \
-            -t "ghcr.io/${IMAGE_NAME}:latest" \
             .
 
           cd github-action
@@ -94,7 +79,4 @@ jobs:
             -t "${IMAGE_NAME}:${IMAGE_VERSION}-githubaction" \
             -t "${IMAGE_NAME}:4-githubaction" \
             -t "${IMAGE_NAME}:latest-githubaction" \
-            -t "ghcr.io/${IMAGE_NAME}:${IMAGE_VERSION}-githubaction" \
-            -t "ghrc.io/${IMAGE_NAME}:4-githubaction" \
-            -t "ghcr.io/${IMAGE_NAME}:latest-githubaction" \
             .

pkg/yqlib/format.go

@@ -3,7 +3,6 @@ package yqlib
 import (
 	"fmt"
 	"path/filepath"
-	"slices"
 	"strings"
 )
 
@@ -96,7 +95,12 @@ func (f *Format) MatchesName(name string) bool {
 	if f.FormalName == name {
 		return true
 	}
-	return slices.Contains(f.Names, name)
+	for _, n := range f.Names {
+		if n == name {
+			return true
+		}
+	}
+	return false
 }
 
 func (f *Format) GetConfiguredEncoder() Encoder {

pkg/yqlib/operator_add.go

@@ -39,19 +39,13 @@ func toNodes(candidate *CandidateNode, lhs *CandidateNode) []*CandidateNode {
 func addOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	log.Debugf("Add operator")
 
-	return crossFunction(d, context.ReadOnlyClone(), expressionNode, add, true)
+	return crossFunction(d, context.ReadOnlyClone(), expressionNode, add, false)
 }
 
 func add(_ *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
 	lhsNode := lhs
 
-	if lhs == nil && rhs == nil {
-		return nil, nil
-	} else if lhs == nil {
-		return rhs.Copy(), nil
-	} else if rhs == nil {
-		return lhs.Copy(), nil
-	} else if lhsNode.Tag == "!!null" {
+	if lhsNode.Tag == "!!null" {
 		return lhs.CopyAsReplacement(rhs), nil
 	}
 

pkg/yqlib/operator_add_test.go

@@ -310,15 +310,6 @@ var addOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!map)::a: !cat Saturday, 15-Dec-01 at 6:00AM GMT\n",
 		},
 	},
-	{
-		skipDoc:        true,
-		description:    "Add to empty",
-		subdescription: "should behave like null",
-		expression:     `.nada + "cat"`,
-		expected: []string{
-			"D0, P[], (!!str)::cat\n",
-		},
-	},
 	{
 		description:    "Add to null",
 		subdescription: "Adding to null simply returns the rhs",