Skip to content

Commit 53e0cd9

Browse files
committed
Re apply 1.25 fixes
1 parent 7048d5d commit 53e0cd9

File tree

3 files changed

+17
-44
lines changed

3 files changed

+17
-44
lines changed

Diff for: .evergreen.yml

+16-15
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ variables:
22
- &go_env
33
XDG_CONFIG_HOME: ${go_base_path}${workdir}
44
GO111MODULE: "on"
5-
GOROOT: "/opt/golang/go1.22"
5+
GOROOT: "/opt/golang/go1.21"
66
functions:
7-
87
"clone":
98
- command: subprocess.exec
109
type: setup
@@ -23,7 +22,7 @@ functions:
2322
params:
2423
script: |
2524
set -Eeu pipefail
26-
25+
2726
curl -fL "${goreleaser_pro_tar_gz}" --output goreleaser_Linux_x86_64.tar.gz
2827
tar -xf goreleaser_Linux_x86_64.tar.gz
2928
chmod 755 ./goreleaser
@@ -36,7 +35,7 @@ functions:
3635
- notary_service_url
3736
script: |
3837
set -Eeu pipefail
39-
38+
4039
curl "${notary_service_url}" --output macos-notary.zip
4140
unzip -u macos-notary.zip
4241
chmod 755 ./linux_amd64/macnotary
@@ -47,6 +46,12 @@ functions:
4746
working_dir: src/github.com/mongodb/mongodb-enterprise-kubernetes/tools/multicluster
4847
include_expansions_in_env:
4948
- GITHUB_TOKEN
49+
- GRS_USERNAME
50+
- GRS_PASSWORD
51+
- PKCS11_URI
52+
- ARTIFACTORY_URL
53+
- ARTIFACTORY_PASSWORD
54+
- SIGNING_IMAGE_URI
5055
- macos_notary_keyid
5156
- macos_notary_secret
5257
- workdir
@@ -74,14 +79,10 @@ tasks:
7479
- func: "release"
7580

7681
buildvariants:
77-
78-
# This variant is kept manual for now in order avoid any interfering with the existing release process.
79-
# In the future, it will be called in one of two ways:
80-
# By PCT when a new operator version is released.
81-
# When a new tag is out similarly to github actions.
82-
- name: release_mcli
83-
display_name: Release Go multi-cluster binary
84-
run_on:
85-
- ubuntu2204-small
86-
tasks:
87-
- name: package_goreleaser
82+
# This variant is run when a new tag is out similar to github actions.
83+
- name: release_mcli
84+
display_name: Release Go multi-cluster binary
85+
run_on:
86+
- ubuntu2204-small
87+
tasks:
88+
- name: package_goreleaser

Diff for: .github/workflows/release-multicluster-cli.yaml

-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +0,0 @@
1-
name: Release multicluster-cli binary
2-
on:
3-
push:
4-
tags:
5-
- '*'
6-
workflow_dispatch:
7-
jobs:
8-
goreleaser:
9-
runs-on: ubuntu-latest
10-
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v3
13-
with:
14-
fetch-depth: 0
15-
- name: Set up Go
16-
uses: actions/setup-go@v4
17-
with:
18-
go-version: '1.21'
19-
- name: Run GoReleaser
20-
uses: goreleaser/goreleaser-action@v4
21-
with:
22-
distribution: goreleaser
23-
version: latest
24-
args: release --rm-dist
25-
workdir: ./tools/multicluster
26-
env:
27-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
GORELEASER_CURRENT_TAG: ${{ github.ref_name }}

Diff for: .gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.idea
22
*.iml
33
.DS_Store
4-
tools/multicluster/linux_amd64/*
4+
tools/multicluster/linux_amd64/*

0 commit comments

Comments
 (0)