Skip to content

Commit df97e68

Browse files
fix release
1 parent 79fc723 commit df97e68

File tree

3 files changed

+0
-124
lines changed

3 files changed

+0
-124
lines changed

build/ci.yaml

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ stages:
55
- Prepare
66
- Test
77
- Build
8-
- Push Dev
98
- Release
109

1110
steps:
@@ -132,25 +131,6 @@ steps:
132131
on:
133132
- success
134133

135-
push_dev:
136-
stage: Push Dev
137-
title: push with dev tags
138-
type: push
139-
candidate: ${{build}}
140-
tags:
141-
- dev-${{CF_BRANCH_TAG_NORMALIZED}}
142-
when:
143-
steps:
144-
- name: build
145-
on:
146-
- success
147-
branch:
148-
ignore: ["main"]
149-
scale:
150-
push_quay_dev:
151-
title: push to quay
152-
registry: "${{REGISTRY_INTEGRATION_QUAY}}"
153-
154134
build_binaries:
155135
<<: *deps
156136
stage: Build
@@ -236,62 +216,3 @@ steps:
236216
- name: build
237217
on:
238218
- success
239-
240-
bump_brew_formula:
241-
stage: Release
242-
title: bump brew formula version
243-
image: codefresh/build-cli
244-
commands:
245-
- |
246-
echo "generate formula from template..."
247-
sed -e "s/{{ version }}/${{VERSION}}/g" -e "s/{{ revision }}/${{CF_REVISION}}/g" ./brew/template.rb > ${{BREW_NAME}}.rb
248-
echo "Updating file in GitHub"
249-
FORMULA_SHA256=$(curl -X GET https://api.github.com/repos/codefresh-io/homebrew-cli/contents/Formula/${{BREW_NAME}}.rb \
250-
-H "Authorization: token ${GITHUB_TOKEN}" \
251-
-s | jq .sha)
252-
echo "sha - ${FORMULA_SHA256}"
253-
STATUS_CODE=$(curl -X PUT https://api.github.com/repos/codefresh-io/homebrew-cli/contents/Formula/${{BREW_NAME}}.rb \
254-
-H "Authorization: token ${GITHUB_TOKEN}" \
255-
-d "{ \
256-
\"message\": \"update formula version to ${VERSION}\", \
257-
\"content\": \"$(openssl base64 -A -in ${{BREW_NAME}}.rb)\", \
258-
\"sha\": ${FORMULA_SHA256} \
259-
}" -s -o response -w "%{http_code}")
260-
echo "statusCode - ${STATUS_CODE}"
261-
if [[ "$STATUS_CODE" -ge 300 ]]; then
262-
cat ./response
263-
echo "failed updating brew formula version"
264-
exit 1
265-
fi
266-
when:
267-
steps:
268-
- name: create_release_bin
269-
on:
270-
- success
271-
condition:
272-
all:
273-
whenVarExists: 'includes("${{BREW_NAME}}", "{{BREW_NAME}}") == false'
274-
275-
276-
push_prod:
277-
stage: Release
278-
title: promote image
279-
type: push
280-
candidate: ${{build}}
281-
tags:
282-
- latest
283-
- ${{VERSION}}
284-
when:
285-
condition:
286-
all:
287-
isBinary: '"${{REPO_TYPE}}" != "lib"'
288-
steps:
289-
- name: create_release_bin
290-
on:
291-
- success
292-
branch:
293-
only: ["main"]
294-
scale:
295-
push_quay:
296-
title: push to quay
297-
registry: "${{REGISTRY_INTEGRATION_QUAY}}"

cmd/commands/common.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ var (
4747
die = util.Die
4848
exit = os.Exit
4949

50-
//go:embed assets/workflows-route-patch.json
51-
workflowsRoutePatch []byte
52-
5350
cfConfig *config.Config
5451

5552
GREEN = "\033[32m"

cmd/commands/runtime_install.go

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,16 @@ import (
5858
apmodel "github.com/codefresh-io/go-sdk/pkg/codefresh/model/app-proxy"
5959
"github.com/ghodss/yaml"
6060
"github.com/go-git/go-billy/v5/memfs"
61-
billyUtils "github.com/go-git/go-billy/v5/util"
6261
"github.com/manifoldco/promptui"
6362
"github.com/rkrmr33/checklist"
6463
"github.com/spf13/cobra"
6564
"golang.org/x/text/cases"
6665
"golang.org/x/text/language"
67-
appsv1 "k8s.io/api/apps/v1"
6866
v1 "k8s.io/api/core/v1"
6967
rbacv1 "k8s.io/api/rbac/v1"
7068
kerrors "k8s.io/apimachinery/pkg/api/errors"
7169
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
7270
kusttypes "sigs.k8s.io/kustomize/api/types"
73-
kustid "sigs.k8s.io/kustomize/kyaml/resid"
7471
)
7572

7673
type (
@@ -1476,45 +1473,6 @@ func CreateInternalRouterIngress(ctx context.Context, opts *CreateIngressOptions
14761473
return apu.PushWithMessage(ctx, r, "Created Internal Router Ingresses")
14771474
}
14781475

1479-
func configureArgoWorkflows(ctx context.Context, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
1480-
r, fs, err := opts.InsCloneOpts.GetRepo(ctx)
1481-
if err != nil {
1482-
return err
1483-
}
1484-
1485-
overlaysDir := fs.Join(apstore.Default.AppsDir, "workflows", apstore.Default.OverlaysDir, rt.Name)
1486-
1487-
if err = billyUtils.WriteFile(fs, fs.Join(overlaysDir, "route-patch.json"), workflowsRoutePatch, 0666); err != nil {
1488-
return err
1489-
}
1490-
1491-
kust, err := kustutil.ReadKustomization(fs, overlaysDir)
1492-
if err != nil {
1493-
return err
1494-
}
1495-
1496-
kust.Patches = append(kust.Patches, kusttypes.Patch{
1497-
Target: &kusttypes.Selector{
1498-
ResId: kustid.ResId{
1499-
Gvk: kustid.Gvk{
1500-
Group: appsv1.SchemeGroupVersion.Group,
1501-
Version: appsv1.SchemeGroupVersion.Version,
1502-
Kind: "Deployment",
1503-
},
1504-
Name: store.Get().ArgoWfServiceName,
1505-
},
1506-
},
1507-
Path: "route-patch.json",
1508-
})
1509-
if err = kustutil.WriteKustomization(fs, kust, overlaysDir); err != nil {
1510-
return err
1511-
}
1512-
1513-
log.G(ctx).Info("Pushing Argo Workflows configuration")
1514-
1515-
return apu.PushWithMessage(ctx, r, "Configured Argo Workflows ")
1516-
}
1517-
15181476
func mergeAnnotations(annotation map[string]string, newAnnotation map[string]string) {
15191477
for key, element := range newAnnotation {
15201478
annotation[key] = element

0 commit comments

Comments
 (0)