Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Promote unstable to rc #729

Merged
merged 6 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# syntax, such as anchors, will be fixed automatically.
version: 2.1
orbs:
shared: getoutreach/shared@2.21.0
shared: getoutreach/shared@2.24.0
queue: eddiewebb/[email protected]

parameters:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## <</Stencil::Block>>
nodejs 18.17.1
protoc 21.5
golang 1.21.3
golang 1.21.5
# Note: Versions in this block do not override the default versions above
# but sometimes you have to declare additional versions of the same tool
# while leaving the 'default' version intact for the infra.
Expand Down
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
// Maps the go module cache on the host to the persistent volume used by devspaces.
// These should be the respective values of `go env GOMODCACHE`.
{
"from": "${env:HOME}/.asdf/installs/golang/1.21.3/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.21.3/packages/pkg/mod"
"from": "${env:HOME}/.asdf/installs/golang/1.21.5/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.21.5/packages/pkg/mod"
},
{
// Maps the standard library location on the host to the location in the devspace.
// This enables debugging standard library code.
"from": "${env:HOME}/.asdf/installs/golang/1.21.3/go/src",
"to": "/home/dev/.asdf/installs/golang/1.21.3/go/src"
"from": "${env:HOME}/.asdf/installs/golang/1.21.5/go/src",
"to": "/home/dev/.asdf/installs/golang/1.21.5/go/src"
}
]
},
Expand Down
24 changes: 12 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/rs/zerolog v1.31.0
github.com/stretchr/testify v1.8.4
github.com/whilp/git-urls v1.0.0
google.golang.org/grpc v1.60.1
google.golang.org/grpc v1.61.0
gopkg.in/yaml.v2 v2.4.0
)

Expand Down Expand Up @@ -41,7 +41,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.2.0 // indirect
Expand Down Expand Up @@ -77,19 +77,19 @@ require (
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.16.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.12.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
50 changes: 25 additions & 25 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"license": "UNLICENSED",
"devDependencies": {
"@getoutreach/semantic-release-circleci-orb": "^1.1.10",
"@semantic-release/commit-analyzer": "^11.0.0",
"@semantic-release/commit-analyzer": "^10.0.1",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^9.2.1",
"@semantic-release/npm": "^11.0.1",
"@semantic-release/release-notes-generator": "^12.0.0",
"conventional-changelog-conventionalcommits": "^7.0.2",
"prettier": "^3.0.3",
"semantic-release": "^22.0.6",
"semver": "^7.5.4"
"@semantic-release/github": "^9.0.3",
"@semantic-release/npm": "^10.0.4",
"@semantic-release/release-notes-generator": "^11.0.3",
"conventional-changelog-conventionalcommits": "^6.0.0",
"prettier": "^2.8.8",
"semantic-release": "^21.0.5",
"semver": "^7.5.2"
}
}
3 changes: 3 additions & 0 deletions root/Magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ func Gobuild(ctx context.Context) error {
}

args := []string{"build", "-v", "-o", binDir, "-ldflags", ldFlags}
if gcFlags := os.Getenv("GC_FLAGS"); gcFlags != "" {
args = append(args, "-gcflags", gcFlags)
}

// SKIP_TRIMPATH is used for devspace binary sync, where you want to have same file paths for delve to work correctly
if os.Getenv("SKIP_TRIMPATH") == "true" {
Expand Down
2 changes: 1 addition & 1 deletion root/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ devspace-watch:
## devspace: build sources for linux with debugging symbols. To be used with devspace using `devenv apps run --sync-binaries .`
.PHONY: devspace
devspace:
@DEVBOX_LOGFMT="$(LOGFMT)" BUILD_FOR_GOOS="linux" CGO_ENABLED=$(CGO_ENABLED) SKIP_TRIMPATH="true" SKIP_STARTING_APP="true" DLV_PORT=42097 $(MAGE_CMD) gobuild
@DEVBOX_LOGFMT="$(LOGFMT)" BUILD_FOR_GOOS="linux" CGO_ENABLED=$(CGO_ENABLED) SKIP_TRIMPATH="true" SKIP_STARTING_APP="true" DLV_PORT=42097 GC_FLAGS="all=-N -l" $(MAGE_CMD) gobuild
@DEVBOX_LOGFMT="$(LOGFMT)" BUILD_FOR_GOOS="linux" CGO_ENABLED=$(CGO_ENABLED) $(MAGE_CMD) e2etestbuild
@echo "Use 'devenv apps run --sync-binaries .' to sync binaries to devspace pod"

Expand Down
7 changes: 5 additions & 2 deletions shell/ci/testing/coverbot/upload-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ SHELL_DIR="$DIR/../../.."
LIB_DIR="$SHELL_DIR/lib"

# shellcheck source=../../../lib/bootstrap.sh
source "${LIB_DIR}/bootstrap.sh"
source "$LIB_DIR/bootstrap.sh"

# shellcheck source=../../../lib/box.sh
source "$LIB_DIR/box.sh"

# Check if coverage file arg is empty
if [[ -s $1 ]]; then
Expand Down Expand Up @@ -37,7 +40,7 @@ PR_NUMBER=$(awk -F'/' '{print $NF}' <<<"$CIRCLE_PULL_REQUEST")

# Assume coverbot-ci-role for S3 bucket permisions
read -r AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN <<<"$(aws sts assume-role-with-web-identity \
--role-arn arn:aws:iam::182192988802:role/coverbot-ci-role \
--role-arn arn:aws:iam::"$(get_box_field aws.defaultAccountID)":role/coverbot-ci-role \
--role-session-name "CircleCI-${SAFE_CIRCLE_WORKFLOW_ID}-${SAFE_CIRCLE_JOB}" \
--web-identity-token "${CIRCLE_OIDC_TOKEN}" \
--duration-seconds 3600 \
Expand Down
41 changes: 0 additions & 41 deletions shell/clerkgenproto.sh

This file was deleted.

Loading