Skip to content

Commit d483959

Browse files
committed
fix: πŸ› use goccy fork to resolve multi-line yaml bug
This PR has been open since May 20 but it resolves the multi-line issues: goccy/go-yaml#740 goccy/go-yaml#801 goccy/go-yaml#802 Forked the repo and merged that branch into my fork in order to resolve the issue.
1 parent 17272e9 commit d483959

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

β€Žexamples/.github/workflows/alveus-example-service-cluster-1.ymlβ€Ž

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333
git config --global user.email '${{ github.actor }}@users.noreply.github.com'
3434
- uses: frenck/action-setup-yq@v1
3535
- name: update-application-yaml
36-
run: "yq e '.spec.source.targetRevision = \"${{ env.ARGOCD_APPLICATION_NEW_TARGET_REVISION }}\"' \\\n'${ARGOCD_APPLICATION_FILE}'"
36+
run: |-
37+
yq e '.spec.source.targetRevision = "${{ env.ARGOCD_APPLICATION_NEW_TARGET_REVISION }}"' \
38+
'${ARGOCD_APPLICATION_FILE}'
3739
- name: git-add-commit
3840
run: |-
3941
git add "${ARGOCD_APPLICATION_FILE}"
@@ -45,4 +47,10 @@ jobs:
4547
- name: argocd-login
4648
run: argocd login "${ARGOCD_URL}" --grpc-web --skip-test-tls
4749
- name: argocd-upsert
48-
run: "argocd app create --upsert --file \"${ARGOCD_APPLICATION_FILE}\" \\\n --grpc-web \\\n --sync-retry-backoff-factor 2 \\\n --sync-retry-backoff-max-duration 3m0s \\\n --sync-retry-limit 2 \\\n ;"
50+
run: |-
51+
argocd app create --upsert --file "${ARGOCD_APPLICATION_FILE}" \
52+
--grpc-web \
53+
--sync-retry-backoff-factor 2 \
54+
--sync-retry-backoff-max-duration 3m0s \
55+
--sync-retry-limit 2 \
56+
;

β€Žgo.modβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,3 +211,5 @@ replace (
211211
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.1
212212
k8s.io/sample-controller => k8s.io/sample-controller v0.33.1
213213
)
214+
215+
replace github.com/goccy/go-yaml => github.com/ghostsquad/goccy-go-yaml v1.18.0-fork-1

β€Žgo.sumβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
109109
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
110110
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
111111
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
112+
github.com/ghostsquad/goccy-go-yaml v1.18.0-fork-1 h1:xD42tBXieAP9MF9ymAZSLMWnN5fHDAaoPiHf8MAXtrI=
113+
github.com/ghostsquad/goccy-go-yaml v1.18.0-fork-1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
112114
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
113115
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
114116
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -145,8 +147,6 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
145147
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
146148
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
147149
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
148-
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
149-
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
150150
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:04sojTxgYxu1L4Hn7Tgf7UVtIosVa6CuHtvNY+7T1K4=
151151
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
152152
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

0 commit comments

Comments
Β (0)